diff options
| author | Shayan Najd <sh.najd@gmail.com> | 2017-08-13 18:37:54 +0000 |
|---|---|---|
| committer | Shayan Najd <sh.najd@gmail.com> | 2017-08-13 18:37:54 +0000 |
| commit | 6752680ee9253aec991cfde4dc447479564e06e7 (patch) | |
| tree | b4802e0583eeb0288123bfc53926ef68b124eabe /validate | |
| parent | 1c771765295bf789d4cda228a1f87c5a2e8e42b5 (diff) | |
| parent | c6462ab02882779d7e33f2cac00cd89a9ac192f1 (diff) | |
| download | haskell-6752680ee9253aec991cfde4dc447479564e06e7.tar.gz | |
Merge branch 'master' of git://git.haskell.org/ghc into GrowableAST
# Conflicts:
# compiler/deSugar/DsArrows.hs
# compiler/deSugar/DsBinds.hs
# compiler/hsSyn/HsBinds.hs
# compiler/hsSyn/HsDecls.hs
# compiler/hsSyn/HsExpr.hs
# compiler/hsSyn/HsLit.hs
# compiler/hsSyn/HsPat.hs
# compiler/typecheck/TcBinds.hs
# compiler/typecheck/TcClassDcl.hs
# compiler/typecheck/TcHsSyn.hs
Diffstat (limited to 'validate')
| -rwxr-xr-x | validate | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -296,6 +296,7 @@ rm -f testsuite_summary.txt testsuite_summary_stage1.txt $make -C testsuite/tests $BINDIST $PYTHON_ARG \ $MAKE_TEST_TARGET stage=2 LOCAL=0 $TEST_VERBOSITY THREADS=$threads \ NO_PRINT_SUMMARY=YES SUMMARY_FILE=../../testsuite_summary.txt \ + JUNIT_FILE=../../testsuite.xml \ 2>&1 | tee testlog # Run a few tests using the stage1 compiler. @@ -304,6 +305,7 @@ $make -C testsuite/tests $BINDIST $PYTHON_ARG \ $make -C testsuite/tests/stage1 $PYTHON_ARG \ $MAKE_TEST_TARGET stage=1 LOCAL=0 $TEST_VERBOSITY THREADS=$threads \ NO_PRINT_SUMMARY=YES SUMMARY_FILE=../../../testsuite_summary_stage1.txt \ + JUNIT_FILE=../../../testsuite_stage1.xml \ 2>&1 | tee testlog-stage1 echo |