Merge branch 'master' of https://github.com/ngorogiannis/cyclist

cyclist-org · Jul 13, 2015 · 2147eea · 2147eea
2 parents 8c2e981 + c1932f7
commit 2147eea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/tests/slmc/Makefile b/tests/slmc/Makefile
@@ -81,7 +81,7 @@ composite-models:
 	EXE="composite 20 $(SEED)" BP_FILE=composite.bps $(MAKE) --no-print-directory models 
 
 composite-tests:
-	TEST_FILE_BASE=composite DEFS_FILE=composite.defs MDL_FILE_BASE=composite $(MAKE) --no-print-directory tests 
+	TEST_FILE_BASE=composite-[0-9] DEFS_FILE=composite.defs MDL_FILE_BASE=composite $(MAKE) --no-print-directory tests 
 
 composite-stats:
 	-@TEST_FILE_BASE=composite-[0-9] DEFS_FILE=composite.defs MDL_FILE_BASE=composite $(MAKE) --no-print-directory stats
@@ -112,7 +112,7 @@ lcset-models:
 	EXE="lcset 8 $(SEED)" BP_FILE=lcset.bps $(MAKE) --no-print-directory models 
 
 lcset-tests:
-	TEST_FILE_BASE=lcset DEFS_FILE=lcset.defs MDL_FILE_BASE=lcset $(MAKE) --no-print-directory tests 
+	TEST_FILE_BASE=lcset-[0-9] DEFS_FILE=lcset.defs MDL_FILE_BASE=lcset $(MAKE) --no-print-directory tests 
 
 lcset-stats:
 	-@TEST_FILE_BASE=lcset-[0-9] DEFS_FILE=lcset.defs MDL_FILE_BASE=lcset $(MAKE) --no-print-directory stats

diff --git a/tests/slmc/models/composite-tree_dispose0000.mdl b/tests/slmc/models/composite-tree_dispose0000.mdl
@@ -0,0 +1 @@
+([ node |-> 0x603010 ], [ 0x603130 |-> node(0x603220, 0x6031f0, 0x603100, 4), 0x6031c0 |-> node(0x603340, 0x6032e0, 0x603190, 3), 0x6030a0 |-> node(0x603250, 0x603160, 0x603070, 7), 0x6032e0 |-> node(0x0, 0x0, 0x6031c0, 1), 0x603370 |-> node(0x0, 0x0, 0x603310, 1), 0x6030d0 |-> node(0x603190, 0x0, 0x603010, 5), 0x603310 |-> node(0x603370, 0x0, 0x6032b0, 2), 0x6031f0 |-> node(0x0, 0x0, 0x603130, 1), 0x603220 |-> node(0x0, 0x6033a0, 0x603130, 2), 0x603340 |-> node(0x0, 0x0, 0x6031c0, 1), 0x603010 |-> node(0x6030d0, 0x603040, 0x0, 20), 0x603100 |-> node(0x0, 0x603130, 0x603040, 5), 0x603250 |-> node(0x603280, 0x0, 0x6030a0, 2), 0x6032b0 |-> node(0x0, 0x603310, 0x603160, 3), 0x603190 |-> node(0x0, 0x6031c0, 0x6030d0, 4), 0x603160 |-> node(0x0, 0x6032b0, 0x6030a0, 4), 0x603040 |-> node(0x603100, 0x603070, 0x603010, 14), 0x603280 |-> node(0x0, 0x0, 0x603250, 1), 0x603070 |-> node(0x0, 0x6030a0, 0x603040, 8), 0x6033a0 |-> node(0x0, 0x0, 0x603220, 1) ])