Applied patch from Larry Doolittle to fix problem where multibuild.pl would

build the wrong files. Made the same changes to multifeat.pl.

diff --git a/tests/multibuild.pl b/tests/multibuild.pl
index 858da360fb6f31fcba2b810f06f7aaf5ea9ddf93..94930bd95b7c1a0a626d2cdad2a61c885a6729ee 100755 (executable)
--- 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 1169a3dafae938d871b48297df454988baac5827..adcb30bbd6d497a015ddd004804d2c8ce94c5b0c 100755 (executable)
--- 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