From 463e2817c55fbd5b026d7dd630541b990b82418a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Oct 2004 12:41:53 +0000 Subject: * Remove ancient Fix tests. * Add automated Nix expression language tests. --- tests/Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 5ac01aca3..ae6da726b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,7 +11,7 @@ TESTS_ENVIRONMENT = TEST_ROOT=$(TEST_ROOT) \ NIX_BUILD_HOOK= \ TOP=$(shell pwd)/.. \ SHARED=$(extra1) \ - $(SHELL) -e -x + $(SHELL) -e simple.sh: simple.nix dependencies.sh: dependencies.nix @@ -22,11 +22,14 @@ substitutes.sh: substitutes.nix substituter.nix substitutes2.sh: substitutes2.nix substituter.nix substituter2.nix fallback.sh: fallback.nix -TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh \ +TESTS = init.sh lang.sh simple.sh dependencies.sh locking.sh parallel.sh \ build-hook.sh substitutes.sh substitutes2.sh fallback.sh verify.sh XFAIL_TESTS = +foo: + $(TESTS_ENVIRONMENT) ./lang.sh + include ../substitute.mk EXTRA_DIST = $(TESTS) \ @@ -37,4 +40,5 @@ EXTRA_DIST = $(TESTS) \ build-hook.nix.in build-hook.hook.sh \ substitutes.nix.in substituter.nix.in substituter.builder.sh \ substitutes2.nix.in substituter2.nix.in substituter2.builder.sh \ - fallback.nix.in + fallback.nix.in \ + $(wildcard lang/*.nix) $(wildcard lang/*.exp) -- cgit v1.2.3