summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2019-07-31 10:30:59 +0100
committerDavid Allsopp <david.allsopp@metastack.com>2019-07-31 10:30:59 +0100
commit37c524b447616ead1ca62b4f8d1f0ca1faa0e0d5 (patch)
treec002d916cd70733992b02a6101d937da77be602f /tools
parentfdda9d2e3b06535a655352ba8cb1bb23e0204810 (diff)
downloadocaml-37c524b447616ead1ca62b4f8d1f0ca1faa0e0d5.tar.gz
Move the quicker tests to the top of the script
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ci/inria/extra-checks54
1 files changed, 27 insertions, 27 deletions
diff --git a/tools/ci/inria/extra-checks b/tools/ci/inria/extra-checks
index cfc807f413..76a4d0a042 100755
--- a/tools/ci/inria/extra-checks
+++ b/tools/ci/inria/extra-checks
@@ -114,6 +114,33 @@ export TSAN_SYMBOLIZER_PATH="$ASAN_SYMBOLIZER_PATH"
#########################################################################
+# Ensure that the repo still passes the check-typo script
+if [ ! -x tools/check-typo ] ; then
+ error "tools/check-typo does not appear to be executable?"
+fi
+tools/check-typo
+
+#########################################################################
+
+echo "======== old school build =========="
+
+$make -s distclean || :
+
+instdir="$HOME/ocaml-tmp-install-$$"
+./configure --prefix "$instdir"
+
+# Build the system without using world.opt
+make $jobs world
+make $jobs opt
+make $jobs opt.opt
+make install
+
+rm -rf "$instdir"
+
+# It's a build system test only, so we don't bother testing the compiler
+
+#########################################################################
+
echo "======== clang 6.0, address sanitizer, UB sanitizer =========="
$make -s distclean || :
@@ -191,25 +218,6 @@ TSAN_OPTIONS="die_after_fork=0" $run_testsuite
#########################################################################
-echo "======== old school build =========="
-
-$make -s distclean || :
-
-instdir="$HOME/ocaml-tmp-install-$$"
-./configure --prefix "$instdir"
-
-# Build the system without using world.opt
-make $jobs world
-make $jobs opt
-make $jobs opt.opt
-make install
-
-rm -rf "$instdir"
-
-# It's a build system test only, so we don't bother testing the compiler
-
-#########################################################################
-
# This is a failed attempt at using the memory sanitizer
# (to detect reads from uninitialized memory).
# Some alarms are reported that look like false positive
@@ -241,11 +249,3 @@ rm -rf "$instdir"
# # Build the system (bytecode only) and test
# make $jobs world
# $run_testsuite
-
-#########################################################################
-
-# Ensure that the repo still passes the check-typo script
-if [ ! -x tools/check-typo ] ; then
- error "tools/check-typo does not appear to be executable?"
-fi
-tools/check-typo