Permalink
Browse files

Clean-up some tests, add an option to be a bit less verbose

  • Loading branch information...
1 parent 020c387 commit a6d6d286e92ef8902acaf2046f3e99e5a86fbd6f @samoht samoht committed Jan 7, 2013
Showing with 12 additions and 2 deletions.
  1. +10 −1 tests/Makefile
  2. +1 −1 tests/compilers/10.comp
  3. +1 −0 tests/test-TEST.sh
View
@@ -12,17 +12,26 @@ OPAM_GIT = $(TMP_DIR)/OPAM.GIT
PACKAGES = P1-1 P1-2 P2 P3 P4 P5
_OPAM = $(realpath ../_obuild/opam/opam.asm)
-ENV = PATH=$(PATH) OCAMLRUNPARAM=b OPAMDEBUG=2 OPAMROOT=$(OPAM_ROOT) OPAMYES=1 OPAM=$(_OPAM)
+ENV = PATH=$(PATH) $(DEBUG) OPAMKEEPBUILDDIR=1 OPAMROOT=$(OPAM_ROOT) OPAMYES=1 OPAM=$(_OPAM)
OPAM = $(ENV) $(_OPAM)
CHECK = $(ENV) $(realpath ../_obuild/opam-check/opam-check.asm)
+ifeq ($(OPAMTESTQUIET), 1)
+ DEBUG =
+else
+ DEBUG = OPAMDEBUG=2 OCAMLRUNPARAM=b
+endif
+
ARCHIVES = $(PACKAGES:%=packages/%.tar.gz)
.PHONY: all local git
all: local git
@
+quiet:
+ $(MAKE) OPAMTESTQUIET=1 all
+
run:
$(MAKE) init && \
$(MAKE) list && \
@@ -1,5 +1,5 @@
opam-version: "1"
-name: "3.12.1"
+name: "10"
preinstalled: true
env: [
[ TEST="1" ]
View
@@ -5,5 +5,6 @@ if [ -f $1 ]; then
fi
if [ x${TEST} != x$2 ]; then
+ echo "Error: TEST=${TEST} instead of $2"
exit 2
fi

0 comments on commit a6d6d28

Please sign in to comment.