git.iko.soy/Idris-dev
on master help sign in
Merge pull request #429 from JasonGross/parallel-tests

Allow tests to be parallelized

commit3ad3bd6ac27b2c32474a4016246744d525ddf215 authorEdwin Brady <edwin.brady@gmail.com> dateSat 3 Aug 2013, 09:48 (13 years ago) parent8a0e9d4ba73fa2
3 files changed+17−11
compare with master
unifiedsplit
Makefile+5−5 test/Makefile+8−2 test/runtest.pl+4−4
Makefile+5−5
@@ -14,15 +14,15 @@ build: dist/setup-config
1414 $(CABAL) build $(CABALFLAGS)
1515
1616test:
17− make -C test IDRIS=../dist/build/idris
17+ $(MAKE) -C test IDRIS=../dist/build/idris
1818
1919test_java:
20− make -C test IDRIS=../dist/build/idris test_java
20+ $(MAKE) -C test IDRIS=../dist/build/idris test_java
2121
2222relib:
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
25− make -C javascript IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build 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
25+ $(MAKE) -C javascript IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
2626 $(CABAL) install $(CABALFLAGS)
2727
2828linecount:
test/Makefile+8−2
@@ -1,5 +1,9 @@
1−test:
2− perl ./runtest.pl all
1+TESTS = $(sort $(patsubst %/,%.test,$(wildcard */)))
2+
3+test: $(TESTS)
4+
5+%.test:
6+ @perl ./runtest.pl $(patsubst %.test,%,$@)
37
48test_java:
59 perl ./runtest.pl all --codegen Java
@@ -63,3 +67,5 @@ diff:
6367distclean:
6468 rm -f *~
6569 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 {
99
1010 chdir($test);
1111
12− print "Running $test...";
12+ print "Running $test...\n";
1313 $got = `sh ./run @idrOpts`;
1414 $exp = `cat expected`;
1515
@@ -33,14 +33,14 @@ sub runtest {
3333 }
3434
3535 if ($got eq $exp) {
36− print "success\n";
36+ print "Ran $test...success\n";
3737 } else {
3838 if ($update == 0) {
3939 $exitstatus = 1;
40− print "FAILURE\n";
40+ print "Ran $test...FAILURE\n";
4141 } else {
4242 system("cp output expected");
43− print "UPDATED\n";
43+ print "Ran $test...UPDATED\n";
4444 }
4545 }
4646 chdir("..");