summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSébastien Hinderer <Sebastien.Hinderer@inria.fr>2019-08-06 14:47:07 +0200
committerSébastien Hinderer <Sebastien.Hinderer@inria.fr>2019-08-06 14:47:07 +0200
commit8c1107d910fb9e3ca07edfe922b56acaa69bdf74 (patch)
tree556895b07eb62ebbd8d69534a1ee46859773710f /tools
parente08a9688fc8235a7e2170357c65ea5830f3a1d4b (diff)
downloadocaml-8c1107d910fb9e3ca07edfe922b56acaa69bdf74.tar.gz
tools/ci/inria/extra-checks: use git clean rather than make distclean
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ci/inria/extra-checks12
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/ci/inria/extra-checks b/tools/ci/inria/extra-checks
index 76a4d0a042..b8bc24639c 100755
--- a/tools/ci/inria/extra-checks
+++ b/tools/ci/inria/extra-checks
@@ -124,7 +124,7 @@ tools/check-typo
echo "======== old school build =========="
-$make -s distclean || :
+git clean -q -f -d -x
instdir="$HOME/ocaml-tmp-install-$$"
./configure --prefix "$instdir"
@@ -143,11 +143,7 @@ rm -rf "$instdir"
echo "======== clang 6.0, address sanitizer, UB sanitizer =========="
-$make -s distclean || :
-
-# `make distclean` does not clean the files from previous versions that
-# are not produced by the current version, so use `git clean` in addition.
-git clean -f -d -x
+git clean -q -f -d -x
# Use clang 6.0
# We cannot give the sanitizer options as part of -cc because
@@ -197,7 +193,7 @@ ASAN_OPTIONS="detect_leaks=0" $run_testsuite
echo "======== clang 6.0, thread sanitizer =========="
-$make -s distclean || :
+git clean -q -f -d -x
./configure CC=clang-6.0
@@ -225,7 +221,7 @@ TSAN_OPTIONS="die_after_fork=0" $run_testsuite
# echo "======== clang 6.0, memory sanitizer =========="
-# $make -s distclean || :
+# git clean -q -f -d -x
# # Use clang 6.0
# # We cannot give the sanitizer options as part of -cc because