Make the determinism tests more robust
authorBartosz Nitka <bnitka@fb.com>
Tue, 1 Dec 2015 15:42:35 +0000 (07:42 -0800)
committerBartosz Nitka <bnitka@fb.com>
Tue, 1 Dec 2015 16:58:33 +0000 (08:58 -0800)
The tests weren't explicit enough about comparing under different
unique allocation strategies. This led to some confusion on my part when
I started overriding flags in `testsuite/mk/test.mk`.
Includes a `.gitignore` rule.

Test Plan: harbormaster

Reviewers: austin, simonmar, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D1555

testsuite/.gitignore
testsuite/tests/determinism/determ003/Makefile
testsuite/tests/determinism/typecheck/Makefile

index b8493f5..dee9012 100644 (file)
@@ -471,6 +471,7 @@ mk/ghcconfig*_test___spaces_ghc*.exe.mk
 /tests/deriving/should_run/drvrun019
 /tests/deriving/should_run/drvrun020
 /tests/deriving/should_run/drvrun021
+/tests/determinism/determinism001
 /tests/dph/classes/dph-classes-copy-fast
 /tests/dph/classes/dph-classes-fast
 /tests/dph/classes/dph-classes-vseg-fast
@@ -1175,6 +1176,7 @@ mk/ghcconfig*_test___spaces_ghc*.exe.mk
 /tests/perf/should_run/InlineCloneArrayAlloc
 /tests/perf/should_run/MethSharing
 /tests/perf/should_run/MethSharing.stats
+/tests/perf/should_run/T10359
 /tests/perf/should_run/T149_A
 /tests/perf/should_run/T149_B
 /tests/perf/should_run/T2902_A
@@ -1221,7 +1223,6 @@ mk/ghcconfig*_test___spaces_ghc*.exe.mk
 /tests/perf/should_run/T876
 /tests/perf/should_run/T9203
 /tests/perf/should_run/T9339
-/tests/perf/should_run/T10359
 /tests/perf/should_run/lazy-bs-alloc
 /tests/perf/should_run/lazy-bs-alloc.stats
 /tests/perf/should_run/speed.f32
index 73231a0..bab18e8 100644 (file)
@@ -6,7 +6,7 @@ TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS))
 
 determ003:
        $(RM) A.hi A.o
-       '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O A.hs
+       '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -dinitial-unique=0 -dunique-increment=1 A.hs
        $(CP) A.hi A.normal.hi
        $(RM) A.hi A.o
        '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -dinitial-unique=16777215 -dunique-increment=-1 A.hs
index f95bfc5..ac98ea1 100644 (file)
@@ -6,7 +6,7 @@ TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS))
 
 determ005:
        $(RM) A.hi A.o
-       '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O A.hs
+       '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs
        $(CP) A.hi A.old.hi
        $(RM) A.o
        '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777206 -dunique-increment=-1 -O A.hs