[commit: ghc] master: Make the determinism tests more robust (b432e2f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b432e2f39c095d8acbb0cfcc63bd08436c7a3e49/ghc

>---------------------------------------------------------------

commit b432e2f39c095d8acbb0cfcc63bd08436c7a3e49
Author: Bartosz Nitka <bnitka at fb.com>
Date:   Tue Dec 1 07:42:35 2015 -0800

    Make the determinism tests more robust
    
    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


>---------------------------------------------------------------

b432e2f39c095d8acbb0cfcc63bd08436c7a3e49
 testsuite/.gitignore                           | 3 ++-
 testsuite/tests/determinism/determ003/Makefile | 2 +-
 testsuite/tests/determinism/typecheck/Makefile | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index b8493f5..dee9012 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -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
diff --git a/testsuite/tests/determinism/determ003/Makefile b/testsuite/tests/determinism/determ003/Makefile
index 73231a0..bab18e8 100644
--- a/testsuite/tests/determinism/determ003/Makefile
+++ b/testsuite/tests/determinism/determ003/Makefile
@@ -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
diff --git a/testsuite/tests/determinism/typecheck/Makefile b/testsuite/tests/determinism/typecheck/Makefile
index f95bfc5..ac98ea1 100644
--- a/testsuite/tests/determinism/typecheck/Makefile
+++ b/testsuite/tests/determinism/typecheck/Makefile
@@ -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