From: Benjamin Barenblat Subject: Disable tests which require -coqlib to be set Forwarded: not-needed A number of tests (mostly for coq_makefile) assume that Coq is installed when the test runs. This isn't true in an sbuild environment, though, so disable those tests. --- a/test-suite/misc/printers.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -if printf "Drop. #use\"include\";; #quit;;\n" | $coqtopbyte 2>&1 | grep -E "Error|Unbound" ; then exit 1; else exit 0; fi --- a/test-suite/coq-makefile/arg/run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make --- a/test-suite/coq-makefile/compat-subdirs/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make -exec test -f "subdir/done" --- a/test-suite/coq-makefile/emptyprefix/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -e - -. ../template/init.sh - -mv theories/sub theories2 - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make - -cp ../_CoqProject.sub theories2/_CoqProject -cd theories2 -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make --- a/test-suite/coq-makefile/extend-subdirs/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make -exec test -f "subdir/done" --- a/test-suite/coq-makefile/latex1/run.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -if which pdflatex; then - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make -exec make all.pdf - -fi -exit 0 # test skipped --- a/test-suite/coq-makefile/merlin1/run.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make .merlin -cat > desired < actual -exec diff -u desired actual --- a/test-suite/coq-makefile/only/run.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make only TGTS="src/test.cmi src/test_aux.cmi" -j2 -test -f src/test.cmi -test -f src/test_aux.cmi -! test -f src/test.cmo --- a/test-suite/coq-makefile/validate1/run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make -exec make validate --- a/test-suite/coq-makefile/coqdoc1/run.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make -make html mlihtml -make install DSTROOT="$PWD/tmp" -make install-doc DSTROOT="$PWD/tmp" -#make debug - -# to learn about <(cmd) see https://www.gnu.org/software/bash/manual/html_node/Process-Substitution.html -( - while IFS= read -r -d '' d - do - pushd "$d" >/dev/null && find . && popd >/dev/null - done < <(find tmp -name user-contrib -print0) -) | sort -u > actual - -sort -u > desired </dev/null && find . && popd >/dev/null - done < <(find tmp -name user-contrib -print0) -) | sort -u > actual - -sort -u > desired <> src/test_aux.ml -export OCAMLPATH=$OCAMLPATH:$PWD/findlib -if which cygpath 2>/dev/null; then - # the only way I found to pass OCAMLPATH on win is to have it contain - # only one entry - OCAMLPATH=$(cygpath -w "$PWD"/findlib) - export OCAMLPATH -fi -make -C findlib/foo clean -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -cat Makefile.local -make -C findlib/foo -make -make byte --- a/test-suite/coq-makefile/mlpack1/run.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make -make html mlihtml -make install DSTROOT="$PWD/tmp" -#make debug -(cd "$(find tmp -name user-contrib)" && find .) | sort > actual -sort > desired < actual -sort > desired </dev/null && find . && popd >/dev/null - done < <(find tmp -name user-contrib -print0) -) | sort -u > actual -sort > desired < actual -sort > desired < actual -sort > desired < actual -sort > desired < ${file}${ext}.processed - done - echo "cat $file" - cat "$file" - echo - diff -u $file.desired.processed $file.processed || exit $? -done - -cd ../per-file-before -coq_makefile -f _CoqProject -o Makefile -make cleanall -make all TIMING=before -j2 || exit $? - -cd ../per-file-after -coq_makefile -f _CoqProject -o Makefile -make cleanall -make all TIMING=after -j2 || exit $? - -find ../per-file-before/ -name "*.before-timing" -exec 'cp' '{}' './' ';' -make all.timing.diff -j2 || exit $? -echo "cat A.v.before-timing" -cat A.v.before-timing -echo -echo "cat A.v.after-timing" -cat A.v.after-timing -echo -echo "cat A.v.timing.diff" -cat A.v.timing.diff -echo - -file=A.v.timing.diff - -for ext in "" .desired; do - sed "${TO_SED_IN_BOTH[@]}" "${TO_SED_IN_PER_LINE[@]}" < "${file}${ext}" | sort > "${file}${ext}.processed" -done - -diff -u "$file.desired.processed" "$file.processed" || exit $? - -exit 0 --- a/test-suite/coq-makefile/uninstall1/run.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -. ../template/init.sh - -coq_makefile -f _CoqProject -o Makefile -cat Makefile.conf -make -make html mlihtml -make install DSTROOT="$PWD/tmp" -make install-doc DSTROOT="$PWD/tmp" -make uninstall DSTROOT="$PWD/tmp" -make uninstall-doc DSTROOT="$PWD/tmp" -#make debug -( - while IFS= read -r -d '' d - do - pushd "$d" >/dev/null && find . && popd >/dev/null - done < <(find tmp -name user-contrib -print0) -) | sort -u > actual -sort -u > desired </dev/null && find . && popd >/dev/null - done < <(find tmp -name user-contrib -print0) -) | sort -u > actual -sort -u > desired <