git.iko.soy/Idris-dev
on master help sign in
Merge pull request #429 from JasonGross/parallel-tests
3ad3bd6Edwin Brady
Makefile+5−5
compare with master
unifiedsplit
@@ -14,15 +14,15 @@ build: dist/setup-config
14 $(CABAL) build $(CABALFLAGS)
14 $(CABAL) build $(CABALFLAGS)
15
15
16test:
16test:
17− make -C test IDRIS=../dist/build/idris
17+ $(MAKE) -C test IDRIS=../dist/build/idris
18
18
19test_java:
19test_java:
20− make -C test IDRIS=../dist/build/idris test_java
20+ $(MAKE) -C test IDRIS=../dist/build/idris test_java
21
21
22relib:
22relib:
23− make -C lib IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts clean
23+ $(MAKE) -C lib IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts clean
24− make -C effects IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
24+ $(MAKE) -C effects IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
25− make -C javascript IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
25+ $(MAKE) -C javascript IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
26 $(CABAL) install $(CABALFLAGS)
26 $(CABAL) install $(CABALFLAGS)
27
27
28linecount:
28linecount:
test/Makefile+8−2
@@ -1,5 +1,9 @@
1+TESTS = $(sort $(patsubst %/,%.test,$(wildcard */)))
2+
3+test: $(TESTS)
4+
1−test:
5+%.test:
2− perl ./runtest.pl all
6+ @perl ./runtest.pl $(patsubst %.test,%,$@)
3
7
4test_java:
8test_java:
5 perl ./runtest.pl all --codegen Java
9 perl ./runtest.pl all --codegen Java
@@ -63,3 +67,5 @@ diff:
63distclean:
67distclean:
64 rm -f *~
68 rm -f *~
65 rm -f */output
69 rm -f */output
70+
71+.phony: test test_java test_js update diff distclean $(TESTS)
test/runtest.pl+4−4
@@ -9,7 +9,7 @@ sub runtest {
9
9
10 chdir($test);
10 chdir($test);
11
11
12− print "Running $test...";
12+ print "Running $test...\n";
13 $got = `sh ./run @idrOpts`;
13 $got = `sh ./run @idrOpts`;
14 $exp = `cat expected`;
14 $exp = `cat expected`;
15
15
@@ -33,14 +33,14 @@ sub runtest {
33 }
33 }
34
34
35 if ($got eq $exp) {
35 if ($got eq $exp) {
36− print "success\n";
36+ print "Ran $test...success\n";
37 } else {
37 } else {
38 if ($update == 0) {
38 if ($update == 0) {
39 $exitstatus = 1;
39 $exitstatus = 1;
40− print "FAILURE\n";
40+ print "Ran $test...FAILURE\n";
41 } else {
41 } else {
42 system("cp output expected");
42 system("cp output expected");
43− print "UPDATED\n";
43+ print "Ran $test...UPDATED\n";
44 }
44 }
45 }
45 }
46 chdir("..");
46 chdir("..");