git.iko.soy/Idris-dev
on master help sign in
Collection of times during tests optional.
33930f1Jan de Muijnck-Hughes
Makefile+3
compare with master
unifiedsplit
@@ -36,6 +36,9 @@ test_all:
36 $(MAKE) test_llvm
36 $(MAKE) test_llvm
37 $(MAKE) test_java
37 $(MAKE) test_java
38
38
39+test_timed:
40+ $(MAKE) -C test IDRIS=../dist/build/idris time
41+
39lib_clean:
42lib_clean:
40 $(MAKE) -C libs IDRIS=../../dist/build/idris/idris RTS=../../dist/build/rts/libidris_rts clean
43 $(MAKE) -C libs IDRIS=../../dist/build/idris/idris RTS=../../dist/build/rts/libidris_rts clean
41
44
test/Makefile+4−1
@@ -1,4 +1,4 @@
1−.PHONY: test test_java test_js update diff distclean $(TESTS)
1+.PHONY: test test_java test_js time update diff distclean $(TESTS)
2
2
3TESTS = $(sort $(patsubst %/,%.test,$(wildcard */)))
3TESTS = $(sort $(patsubst %/,%.test,$(wildcard */)))
4
4
@@ -16,6 +16,9 @@ update:
16diff:
16diff:
17 /usr/bin/env perl ./runtest.pl all -d
17 /usr/bin/env perl ./runtest.pl all -d
18
18
19+time:
20+ /usr/bin/env perl ./runtest.pl all -t
21+
19distclean:
22distclean:
20 rm -f *~
23 rm -f *~
21 rm -f */output
24 rm -f */output
test/runtest.pl+14−8
@@ -49,7 +49,7 @@ sub sandbox_path {
49# output and report results.
49# output and report results.
50#
50#
51sub runtest {
51sub runtest {
52− my ($test, $update) = @_;
52+ my ($test, $update, $showTime) = @_;
53
53
54 my $sandbox = sandbox_path($test);
54 my $sandbox = sandbox_path($test);
55
55
@@ -63,7 +63,9 @@ sub runtest {
63 my $endTime = time();
63 my $endTime = time();
64 my $elapsedTime = $endTime - $startTime;
64 my $elapsedTime = $endTime - $startTime;
65
65
66+ if ($showTime == 1 ){
66− printf("Duration of $test was %d\n", $elapsedTime);
67+ printf("Duration of $test was %d\n", $elapsedTime);
68+ }
67
69
68 # Allow for variant expected output for tests by overriding expected
70 # Allow for variant expected output for tests by overriding expected
69 # when there is an expected.<os> file in the test.
71 # when there is an expected.<os> file in the test.
@@ -161,15 +163,17 @@ else {
161
163
162# Run the tests.
164# Run the tests.
163
165
164−my $update = 0;
166+my $update = 0;
165−my $diff = 0;
167+my $diff = 0;
166−my $show = 0;
168+my $show = 0;
167−my $usejava = 0;
169+my $usejava = 0;
170+my $showTime = 0;
168
171
169while (my $opt = shift @opts) {
172while (my $opt = shift @opts) {
170 if ($opt eq "-u") { $update = 1; }
173 if ($opt eq "-u") { $update = 1; }
171 elsif ($opt eq "-d") { $diff = 1; }
174 elsif ($opt eq "-d") { $diff = 1; }
172 elsif ($opt eq "-s") { $show = 1; }
175 elsif ($opt eq "-s") { $show = 1; }
176+ elsif ($opt eq "-t") { $showTime = 1; }
173 else { push(@idrOpts, $opt); }
177 else { push(@idrOpts, $opt); }
174}
178}
175
179
@@ -181,7 +185,7 @@ my $startTime = time();
181
185
182foreach my $test (@tests) {
186foreach my $test (@tests) {
183 if ($diff == 0 && $show == 0) {
187 if ($diff == 0 && $show == 0) {
184− runtest($test,$update);
188+ runtest($test,$update,$showTime);
185 }
189 }
186 else {
190 else {
187 chdir $test;
191 chdir $test;
@@ -203,6 +207,8 @@ foreach my $test (@tests) {
203my $endTime = time();
207my $endTime = time();
204my $elapsedTime = $endTime - $startTime;
208my $elapsedTime = $endTime - $startTime;
205
209
210+if ($showTime == 1) {
206−printf("Duration of Entire Test Suite was %d\n", $elapsedTime);
211+ printf("Duration of Entire Test Suite was %d\n", $elapsedTime);
212+}
207
213
208exit $exitstatus;
214exit $exitstatus;