summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlina Banerjee <alina@glitchgirl.us>2021-06-02 22:55:53 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2021-07-27 12:01:15 -0400
commit83a88988a99d37b850cb4658456f4850832c4272 (patch)
tree3bdbd88aa325da47b5b593be99f8e6b87fde2997
parent07696269824b78d7c9355a4897239e9ec0110c1e (diff)
downloadhaskell-83a88988a99d37b850cb4658456f4850832c4272.tar.gz
validate: run stage1 tests using stage1 compiler when BINSTIST is false
-rwxr-xr-xvalidate15
1 files changed, 13 insertions, 2 deletions
diff --git a/validate b/validate
index b38f31f3c9..e3b68cecd6 100755
--- a/validate
+++ b/validate
@@ -422,8 +422,19 @@ if [ $testsuite_only -eq 1 ] ||
--summary=$basedir/testsuite_summary.txt \
--summary-junit=$basedir/testsuite.xml"
sh -c "$hadrian $hadrian_test_with_args \"$test_perf_args\""
- # TODO: Run testsuite/tests/stage1 using the stage 1 compiler when
- # BINDIST=NO.
+
+ # Use stage1 compiler when BINDIST=NO
+ if [ "$BINDIST" = "NO" ] && [ ! -d "bindisttest/install dir" ]; then
+ hadrian_test_with_args_stage1="test --test-speed=$HADRIAN_TEST_SPEED \
+ --test-root-dirs=\"$basedir/testsuite/tests/stage1\" \
+ --test-compiler=\"$testghc\" \
+ --summary=$basedir/testsuite_summary_stage1.txt \
+ --summary-junit=$basedir/testsuite_stage1.xml"
+ sh -c "$hadrian $hadrian_test_with_args_stage1 \"$test_perf_args\""
+
+ echo '==== STAGE 1 TESTS (using Hadrian) ==== '
+ cat testsuite_summary_stage1.txt
+ fi
echo '==== STAGE 2 TESTS (using Hadrian) ==== '
cat testsuite_summary.txt