Fix Makefiles in test
authorAndres Notzli <andres.noetzli@gmail.com>
Fri, 18 Nov 2016 02:24:47 +0000 (18:24 -0800)
committerAndres Notzli <andres.noetzli@gmail.com>
Fri, 18 Nov 2016 02:24:47 +0000 (18:24 -0800)
With the recent changes to the regress tests, some of the Makefiles were
not in sync anymore. This commit fixes that.

34 files changed:
test/Makefile.am
test/regress/Makefile.levels
test/regress/regress0/Makefile.am
test/regress/regress0/arith/Makefile.am
test/regress/regress0/arith/integers/Makefile.am
test/regress/regress0/arrays/Makefile.am
test/regress/regress0/aufbv/Makefile.am
test/regress/regress0/auflia/Makefile.am
test/regress/regress0/bv/Makefile.am
test/regress/regress0/bv/core/Makefile.am
test/regress/regress0/datatypes/Makefile.am
test/regress/regress0/decision/Makefile.am
test/regress/regress0/fmf/Makefile.am
test/regress/regress0/lemmas/Makefile.am
test/regress/regress0/parser/Makefile.am
test/regress/regress0/precedence/Makefile.am
test/regress/regress0/preprocess/Makefile.am
test/regress/regress0/push-pop/Makefile.am
test/regress/regress0/push-pop/arith/Makefile.am
test/regress/regress0/push-pop/boolean/Makefile.am
test/regress/regress0/quantifiers/Makefile.am
test/regress/regress0/rels/Makefile.am
test/regress/regress0/rewriterules/Makefile.am
test/regress/regress0/sep/Makefile.am
test/regress/regress0/sets/Makefile.am
test/regress/regress0/strings/Makefile.am
test/regress/regress0/sygus/Makefile.am
test/regress/regress0/tptp/Makefile.am
test/regress/regress0/uf/Makefile.am
test/regress/regress0/uflia/Makefile.am
test/regress/regress0/uflra/Makefile.am
test/regress/regress0/unconstrained/Makefile.am
test/system/Makefile.am
test/unit/Makefile.am

index a71cbfe601eedd017e9c78f81c98834e544af832..b2df85e9777e725d810d06c6314a1fbae761e473 100644 (file)
@@ -2,8 +2,8 @@ SUBDIRS = unit system regress .
 
 MAKEFLAGS = -k
 
-.PHONY: units systemtests regress regress0 regress1 regress2 regress3
-units systemtests regress regress0 regress1 regress2 regress3:
+.PHONY: units systemtests regress regress0 regress1 regress2 regress3 regress4
+units systemtests regress regress0 regress1 regress2 regress3 regress4:
        @$(MAKE) check-pre; \
        for dir in $(SUBDIRS); do \
                test $$dir = . || (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@); \
@@ -29,42 +29,55 @@ test "X$(AM_COLOR_TESTS)" != Xno \
 }
 
 subdirs_to_check = \
-       unit \
-       system \
        regress/regress0 \
        regress/regress0/arith \
        regress/regress0/arith/integers \
-       regress/regress0/uf \
-       regress/regress0/uflra \
-       regress/regress0/uflia \
-       regress/regress0/bv \
-       regress/regress0/bv/core \
        regress/regress0/arrays \
        regress/regress0/aufbv \
        regress/regress0/auflia \
+       regress/regress0/bv \
+       regress/regress0/bv/core \
        regress/regress0/datatypes \
-       regress/regress0/quantifiers \
-       regress/regress0/rewriterules \
+       regress/regress0/decision \
+       regress/regress0/fmf \
        regress/regress0/lemmas \
+       regress/regress0/parser \
+       regress/regress0/precedence \
+       regress/regress0/preprocess \
        regress/regress0/push-pop \
        regress/regress0/push-pop/arith \
        regress/regress0/push-pop/boolean \
-       regress/regress0/precedence \
-       regress/regress0/preprocess \
-       regress/regress0/tptp \
-       regress/regress0/unconstrained \
-       regress/regress0/decision \
-       regress/regress0/fmf \
-       regress/regress0/strings \
-       regress/regress0/sets \
+       regress/regress0/quantifiers \
        regress/regress0/rels \
-       regress/regress0/parser \
-       regress/regress0/sygus \
+       regress/regress0/rewriterules \
        regress/regress0/sep \
+       regress/regress0/sets \
+       regress/regress0/strings \
+       regress/regress0/sygus \
+       regress/regress0/tptp \
+       regress/regress0/uf \
+       regress/regress0/uflia \
+       regress/regress0/uflra \
+       regress/regress0/unconstrained \
        regress/regress1 \
-       regress/regress1/arith \
+       regress/regress1/aufbv \
+       regress/regress1/auflia \
+       regress/regress1/bv \
+       regress/regress1/datatypes \
+       regress/regress1/decision \
+       regress/regress1/fmf \
+       regress/regress1/lemmas \
+       regress/regress1/rewriterules \
+       regress/regress1/sep \
+       regress/regress1/sets \
+       regress/regress1/strings \
+       regress/regress1/sygus \
        regress/regress2 \
-       regress/regress3
+       regress/regress2/arith \
+       regress/regress3 \
+       regress/regress4 \
+       system \
+       unit
 
 check-recursive: check-pre
 .PHONY: check-pre
index f86bd4a6f0e5e6835282fdd1f9bb3a5c6c4e8a3f..ecfb0c2e59eb0739b56bde1650ff4a704363ce28 100644 (file)
@@ -9,3 +9,6 @@ endif
 ifeq ($(REGRESSION_LEVEL),3)
 SUBDIRS += regress1 regress2 regress3
 endif
+ifeq ($(REGRESSION_LEVEL),4)
+SUBDIRS += regress1 regress2 regress3 regress4
+endif
index ec09c9a4a490ee5c1d443bde9606b75076de3972..a65a61dc761cd25070f04485a277188794aeea68 100644 (file)
@@ -206,5 +206,5 @@ EXTRA_DIST += $(DISABLED_TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 2fd1925f1c5b0582c5e957f6260fb9aea4611a38..8a7b19461d786f67ac9f457f775090a59b03e05d 100644 (file)
@@ -75,5 +75,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 3b6a86bc02f8a5ecaa6dcf99cc2a50532c2adba0..aa24e9c35bf391866e416074da89016b1f5ae8db 100644 (file)
@@ -145,5 +145,5 @@ FAILING_TESTS = \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index a90b238e2eb9c468b973a70d98281b101ac2d907..19aab3e551e7232f85f4503dd03089322124a5e8 100644 (file)
@@ -67,5 +67,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index d88128e729e1afea06e86de0ff08972299a8cbdc..e23368e3a123de98685aec1865ac17d7078fa6ca 100644 (file)
@@ -75,5 +75,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 82ea731d4f95f1913854467fb86d55eec8c51b05..8ce7ae1342f85abf206b32359d9b0d51074b709c 100644 (file)
@@ -48,5 +48,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 2aeb7a220dff4ba8bfa892eca0cd12d70f7824ac..b3c7250ff8ea81489e7ac8b305b195494062adef 100644 (file)
@@ -125,5 +125,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 0e3133b327c7722df9b9e64e9434403461cc60d8..ce65bcaf6eaae0337a9b7dbfda43387d89f24188 100644 (file)
@@ -92,5 +92,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index c177129b42f94a89cc94ba7bff5cdcafc01882a7..8631a4f32fc67a4d343f6a9fd51b0b1991158d71 100644 (file)
@@ -94,5 +94,5 @@ EXTRA_DIST += \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 6aea21f3fee4627ec0335110c5ac203ec2e1d899..ccf86e8b41254ba45e2c04ff3baea420518e5056 100644 (file)
@@ -73,5 +73,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index c10b3c668563642812c853ae328188ed7694d004..cea0d76867634ef43dc5f9e760e64eb0af075619 100644 (file)
@@ -77,5 +77,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 26610304a0c0c7870d6c3eaafe65dffccc7d3e92..89f9d83a31e2540c93c61800708b7e7b775144de 100644 (file)
@@ -37,5 +37,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 44318d49255eaf529bae8f7fc4cddb0d2846961e..ab91679438408711f976159296ec1203ea928306 100644 (file)
@@ -41,5 +41,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 1afcc0293115b230673716b9980ee0974a6f26e9..096237106243125aa72176bdda4d5f4e001e4d4b 100644 (file)
@@ -21,8 +21,8 @@ MAKEFLAGS = -k
 TESTS = \
        and-xor.cvc \
        and-not.cvc \
-        bool-cmp.cvc \
-        cmp-plus.cvc \
+       bool-cmp.cvc \
+       cmp-plus.cvc \
        eq-fun.cvc \
        iff-assoc.cvc \
        iff-implies.cvc \
@@ -31,7 +31,7 @@ TESTS = \
        implies-or.cvc \
        not-and.cvc \
        not-eq.cvc \
-        plus-mult.cvc \
+       plus-mult.cvc \
        or-implies.cvc \
        or-xor.cvc \
        xor-or.cvc \
@@ -55,5 +55,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index d83df41922d8046f5e988c49696bfde0143f752e..8ec5e35f6df06449da7d5ff37deede772224846c 100644 (file)
@@ -58,5 +58,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 4bc16ea25bf66ae72504a3b9c576ab12d676b088..8f1126ef57ba46d2d90b5531a6a45798c890b273 100644 (file)
@@ -58,5 +58,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 7838e202ddd6599307bd567fbb95f5eb2804f717..e692c86b2c54472cc8b1358bc80afd697aea5854 100644 (file)
@@ -58,5 +58,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 995312ceebfcf04c6d1fe4a631777e8408650d61..a1eb4fd3177662a916797685aa4b3b2d3258b1f8 100644 (file)
@@ -92,5 +92,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 43c77973fefdb59f09ad604b1a55277f5cd17e28..faa2abe9a089f23a8b3635e2ee1e08e82c4d2925 100644 (file)
@@ -123,5 +123,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 6b8fdfec719350877381d55fee1427e314ce0161..50f979fbd3d23da45f6f71736b6969dc1f4eebf7 100644 (file)
@@ -111,5 +111,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 3224563ab3dc99d39a1af359f95c5c778abdb32f..fcaa9dc2b71e77cb73a39784cef8badc26e03753 100644 (file)
@@ -49,5 +49,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 2d35aef512615f5652a5092ec9a1767bf01c49db..f731bd15eaad954b05f05eb05b4d83fc616f7950 100644 (file)
@@ -75,5 +75,5 @@ EXTRA_DIST +=
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 9c970c45abddbe98b42c3a17761c1308bcc4abb5..f68b9b036528b7fab2b2588c7b05926d2002a996 100644 (file)
@@ -83,5 +83,5 @@ EXTRA_DIST += \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 88f3763e1e0a86d56e5bf74ade8d40b614349670..21d51199db1abe0c76bcf6ab9097fc6b5961e4da 100644 (file)
@@ -100,5 +100,5 @@ EXTRA_DIST +=
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 695c52cc67a9061cfee5cdf2df2b2cb7fb2c2c85..0764b5d77a9b3b971d39b0c99178ff6b08bddb2f 100644 (file)
@@ -26,7 +26,7 @@ TESTS = commutative.sy \
         array_sum_2_5.sy \
         parity-AIG-d0.sy \
         twolets1.sy \
-        array_search_2.sy \        
+        array_search_2.sy \
         hd-01-d1-prog.sy \
         icfp_28_10.sy \
         const-var-test.sy \
@@ -74,5 +74,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index e9274d2ee216aa86f20b5e211ebeb4a7c30b28a0..a6444c3cb0f280d8d10bc0c983c8da1099ee94d2 100644 (file)
@@ -81,5 +81,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index c9a47c26f06b47b0feb46f57751a0d147c118da8..91b2768892fba4772017294bbe6d4e905bc427af 100644 (file)
@@ -70,5 +70,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 2946d886a885b5bdf1fa46eaf5096119ef10da03..db67df18e33c453f9633c8e7ee50acdf8c31677f 100644 (file)
@@ -74,5 +74,5 @@ EXTRA_DIST = $(TESTS) \
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index cd39284b89bbf0f6e47e25f0a730dd33c9563fc7..09c012ffae6ab33eeb1ab20c09b167b6696e6471 100644 (file)
@@ -61,5 +61,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index f79f68c769bae90f2d659a5ecb4dc8807dec7ed9..b212272534062d8a267d997fd1298bcbf99cf2e7 100644 (file)
@@ -91,5 +91,5 @@ EXTRA_DIST = $(TESTS)
 regress regress0 test: check
 
 # do nothing in this subdir
-.PHONY: regress1 regress2 regress3
-regress1 regress2 regress3:
+.PHONY: regress1 regress2 regress3 regress4
+regress1 regress2 regress3 regress4:
index 6d278409ebe030f6f2a59d30f3fcb235ea586af1..55a6c2b09baef8c7620078685bd52d95ea44ecfc 100644 (file)
@@ -115,5 +115,5 @@ export VERBOSE = 1
 test systemtests: check
 
 # no-ops here
-.PHONY: units regress regress0 regress1 regress2 regress3
-units regress regress0 regress1 regress2 regress3:
+.PHONY: units regress regress0 regress1 regress2 regress3 regress4
+units regress regress0 regress1 regress2 regress3 regress4:
index 9d934a6e06ab723bcd91570fe31a20f295ceee4d..129d086df34cb322bbccdb8c5432fef250809456 100644 (file)
@@ -209,8 +209,8 @@ endif
 units test: check
 
 # no-ops here
-.PHONY: systemtests regress regress0 regress1 regress2 regress3
-regress regress0 regress1 regress2 regress3:
+.PHONY: systemtests regress regress0 regress1 regress2 regress3 regress4
+regress regress0 regress1 regress2 regress3 regress4:
 
 if HAVE_CXXTESTGEN
 # all is fine with the world