From e2d51469e633e0fab8ba1fd4ae98facf0f221440 Mon Sep 17 00:00:00 2001
From: MMGen <mmgen@tuta.io>
Date: Mon, 26 Feb 2018 17:01:20 +0000
Subject: [PATCH] scrambletest.py: add coverage support test.py altcoin_ref:
 enable internal ed25519

---
 mmgen/main_tool.py      |  2 +-
 scripts/test-release.sh | 11 ++++++-----
 test/scrambletest.py    | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/mmgen/main_tool.py b/mmgen/main_tool.py
index f6a84904..105baf67 100755
--- a/mmgen/main_tool.py
+++ b/mmgen/main_tool.py
@@ -136,7 +136,7 @@ Type '{pn} help <command> for help on a particular command
 	)
 }
 
-cmd_args = opts.init(opts_data,add_opts=['hidden_incog_input_params','in_fmt'])
+cmd_args = opts.init(opts_data,add_opts=['hidden_incog_input_params','in_fmt','use_internal_ed25519_mod'])
 
 if len(cmd_args) < 1: opts.usage()
 
diff --git a/scripts/test-release.sh b/scripts/test-release.sh
index ee04fa6c..8639daad 100755
--- a/scripts/test-release.sh
+++ b/scripts/test-release.sh
@@ -50,13 +50,14 @@ do
 		echo   "     gen     - gentest (all supported coins)"
 		echo   "  By default, all tests are run"
 		exit ;;
-	C)  test_py='test/test.py --coverage'
-		tooltest_py='test/tooltest.py --coverage'
-		fcov='test/trace.acc' dcov='test/trace'
-		python="python -m trace --count --file=$fcov --coverdir=$dcov"
+	C)  mkdir -p 'test/trace'
+		touch 'test/trace.acc'
+		test_py="$test_py --coverage"
+		tooltest_py="$tooltest_py --coverage"
+		scrambletest_py="$scrambletest_py --coverage"
+		python="python -m trace --count --file=test/trace.acc --coverdir=test/trace"
 		objtest_py="$python $objtest_py"
 		gentest_py="$python $gentest_py"
-		scrambletest_py="$python $scrambletest_py"
 		mmgen_tool="$python $mmgen_tool"
 		mmgen_keygen="$python $mmgen_keygen"
 		rounds=2 rounds_low=2 rounds_spec=2 gen_rounds=2 monero_addrs='3,23,105' ;;
diff --git a/test/scrambletest.py b/test/scrambletest.py
index decddcf4..94057fdd 100755
--- a/test/scrambletest.py
+++ b/test/scrambletest.py
@@ -28,6 +28,7 @@ os.environ['MMGEN_TEST_SUITE'] = '1'
 
 # Import this _after_ local path's been added to sys.path
 from mmgen.common import *
+from mmgen.test import init_coverage
 
 opts_data = lambda: {
 	'desc': 'Test seed scrambling and addrlist data generation for all supported altcoins',
@@ -35,6 +36,7 @@ opts_data = lambda: {
 	'options': """
 -h, --help          Print this help message
 --, --longhelp      Print help message for long options (common options)
+-C, --coverage      Produce code coverage info using trace module
 -l, --list-cmds     List and describe the tests and commands in this test suite
 -s, --system        Test scripts and modules installed on system rather than
                     those in the repo root
@@ -72,6 +74,9 @@ test_data = OrderedDict([
 ('xmr',           ('c76af3b088da3364','xmr:monero',   '-XMR-M','XMR:MONERO','41tmwZd2CdXEGtWqGY9fH9FVtQM8VxZASYPQ3VJQhFjtGWYzQFuidD21vJYTi2yy3tXRYXTNXBTaYVLav62rwUUpFFyicZU')),
 ])
 
+cmd_base = 'python{} cmds/mmgen-addrgen -qS'.format(
+	' -m trace --count --coverdir={} --file={}'.format(*init_coverage()) if opt.coverage else '')
+
 def run_tests():
 	for test in test_data:
 		if test == 'zec_zcash_z' and g.platform == 'win':
@@ -79,13 +84,11 @@ def run_tests():
 			continue
 		try:    coin,mmtype = test.split('_',1)
 		except: coin,mmtype = test,None
-		cmd_name = 'cmds/mmgen-addrgen'
-		wf = 'test/ref/98831F3A.mmwords'
-		type_arg = ['--type='+mmtype] if mmtype else []
-		cmd = ['python',cmd_name,'-qS','--coin='+coin] + type_arg + [wf,'1']
-		vmsg(green('Executing: {}'.format(' '.join(cmd))))
-		msg_r('Testing: --coin {:4} {:22}'.format(coin.upper(),type_arg[0] if type_arg else ''))
-		p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+		type_arg = ' --type='+mmtype if mmtype else ''
+		cmd = '{} --coin={}{} test/ref/98831F3A.mmwords 1'.format(cmd_base,coin,type_arg)
+		vmsg(green('Executing: {}'.format(cmd)))
+		msg_r('Testing: --coin {:4} {:22}'.format(coin.upper(),type_arg))
+		p = subprocess.Popen(cmd.split(),stdout=subprocess.PIPE,stderr=subprocess.PIPE)
 		o = p.stdout.read()
 		vmsg(o)
 		o = o.splitlines()