about summary refs log tree commit diff stats
path: root/test/test_all.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2015-10-10 10:46:46 +0200
committerserpilliere <serpilliere@users.noreply.github.com>2015-10-10 10:46:46 +0200
commit9acc75956e3f7afc6837fe5da3613a4ddd5565a9 (patch)
tree4676cdfbdf687ce713e5cb6f6b6a6ef1a0ceab16 /test/test_all.py
parentcbb7a7bb62734b9a5ca2d2a126b060c8c7b72588 (diff)
parenta2494c14424780d8d43ae1dc51509671cec40c16 (diff)
downloadmiasm-9acc75956e3f7afc6837fe5da3613a4ddd5565a9.tar.gz
miasm-9acc75956e3f7afc6837fe5da3613a4ddd5565a9.zip
Merge pull request #225 from commial/fix_test_deletion
Fix test deletion
Diffstat (limited to 'test/test_all.py')
-rw-r--r--test/test_all.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/test/test_all.py b/test/test_all.py
index 2f4efc88..9773022f 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -139,19 +139,19 @@ for script in ["win_api_x86_32.py",
 testset += RegressionTest(["depgraph.py"], base_dir="analysis",
                           products=[fname for fnames in (
                               ["graph_test_%02d_00.dot" % test_nb,
+                               "exp_graph_test_%02d_00.dot" % test_nb,
                                "graph_%02d.dot" % test_nb]
-                              for test_nb in xrange(1, 17))
+                              for test_nb in xrange(1, 18))
                                     for fname in fnames] +
-                          ["graph_test_03_01.dot",
-                           "graph_test_05_01.dot",
-                           "graph_test_08_01.dot",
-                           "graph_test_09_01.dot",
-                           "graph_test_10_01.dot",
-                           "graph_test_12_01.dot",
-                           "graph_test_13_01.dot",
-                           "graph_test_14_01.dot",
-                           "graph_test_15_01.dot"
-                       ])
+                          [fname for fnames in (
+                              ["graph_test_%02d_%02d.dot" % (test_nb, res_nb),
+                               "exp_graph_test_%02d_%02d.dot" % (test_nb,
+                                                                 res_nb)]
+                              for (test_nb, res_nb) in ((3, 1), (5, 1), (8, 1),
+                                                        (9, 1), (10, 1),
+                                                        (12, 1), (13, 1),
+                                                        (14, 1), (15, 1)))
+                           for fname in fnames])
 
 # Examples
 class Example(Test):
@@ -343,7 +343,7 @@ class ExampleSymbolExec(Example):
 
 testset += ExampleSymbolExec(["single_instr.py"])
 for options, nb_sol, tag in [([], 8, []),
-                             (["-i", "--rename-args"], 12, [TAGS["z3"]])]:
+                             (["-i", "--rename-args"], 10, [TAGS["z3"]])]:
     testset += ExampleSymbolExec(["depgraph.py",
                                   Example.get_sample("simple_test.bin"),
                                   "-m", "x86_32", "0x0", "0x8b",