diff options
| author | Mark Whitley | 2001-03-15 22:14:26 +0000 |
|---|---|---|
| committer | Mark Whitley | 2001-03-15 22:14:26 +0000 |
| commit | 056960d8dc3c849e055ddeac87316a234f18da7d (patch) | |
| tree | 4eb2efd0d902a54cdffa8d669e204d118b7d30a2 | |
| parent | 0d5051def02e35f5db228d8003b3102382610d59 (diff) | |
| download | busybox-056960d8dc3c849e055ddeac87316a234f18da7d.zip busybox-056960d8dc3c849e055ddeac87316a234f18da7d.tar.gz | |
Applied patch from Larry Doolittle to fix problem where multibuild.pl would
build the wrong files. Made the same changes to multifeat.pl.
| -rwxr-xr-x | tests/multibuild.pl | 8 | ||||
| -rwxr-xr-x | tests/multifeat.pl | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/tests/multibuild.pl b/tests/multibuild.pl index 858da36..94930bd 100755 --- a/tests/multibuild.pl +++ b/tests/multibuild.pl @@ -53,14 +53,16 @@ for $a (@apps) { print O "#define BB_$a\n", $trailer; close O; system("echo -e '\n***\n$a\n***' >>$logfile"); - # todo: figure out why the "rm -f *.o" is needed - $result{$a} = system("rm -f *.o; make $make_opt busybox >>$logfile 2>&1"); + # With a fast computer and 1-second resolution on file timestamps, this + # process pushes beyond the limits of what unix make can understand. + # That's why need to weed out obsolete files before restarting make. + $result{$a} = system("rm -f *.o applet_source_list; make $make_opt busybox >>$logfile 2>&1"); $flag = $result{$a} ? "FAILED!!!" : "ok"; printf("Applet %-20s: %s\n", $a, $flag); $total_tests++; $failed_tests++ if $flag eq "FAILED!!!"; # pause long enough to let user stop us with a ^C - select(undef, undef, undef, 0.05); + select(undef, undef, undef, 0.03); } # Clean up our mess diff --git a/tests/multifeat.pl b/tests/multifeat.pl index 1169a3d..adcb30b 100755 --- a/tests/multifeat.pl +++ b/tests/multifeat.pl @@ -63,14 +63,16 @@ for $f (@features) { print O $header, "#define BB_FEATURE_$f\n", $trailer; close O; system("echo -e '\n***\n$f\n***' >>$logfile"); - # todo: figure out why the "rm -f *.o" is needed - $result{$f} = system("rm -f *.o; make $make_opt busybox >>$logfile 2>&1"); + # With a fast computer and 1-second resolution on file timestamps, this + # process pushes beyond the limits of what unix make can understand. + # That's why need to weed out obsolete files before restarting make. + $result{$f} = system("rm -f *.o applet_source_list; make $make_opt busybox >>$logfile 2>&1"); $flag = $result{$f} ? "FAILED!!!" : "ok"; printf("Feature %-20s: %s\n", $f, $flag); $total_tests++; $failed_tests++ if $flag eq "FAILED!!!"; # pause long enough to let user stop us with a ^C - select(undef, undef, undef, 0.05); + select(undef, undef, undef, 0.03); } # Clean up our mess |