diff options
Diffstat (limited to 'tests/multifeat.pl')
-rwxr-xr-x | tests/multifeat.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/multifeat.pl b/tests/multifeat.pl index adcb30bbd..875b4a277 100755 --- a/tests/multifeat.pl +++ b/tests/multifeat.pl | |||
@@ -11,14 +11,14 @@ | |||
11 | 11 | ||
12 | $logfile = "multifeat.log"; | 12 | $logfile = "multifeat.log"; |
13 | 13 | ||
14 | # How to handle all the BB_APPLET lines | 14 | # How to handle all the CONFIG_APPLET lines |
15 | # (most thorough testing occurs when you call it with the -all switch) | 15 | # (most thorough testing occurs when you call it with the -all switch) |
16 | if ($ARGV[0] eq "-all" ) { shift(@ARGV); $choice="all"; } | 16 | if ($ARGV[0] eq "-all" ) { shift(@ARGV); $choice="all"; } |
17 | if ($ARGV[0] eq "-none") { shift(@ARGV); $choice="none"; } | 17 | if ($ARGV[0] eq "-none") { shift(@ARGV); $choice="none"; } |
18 | # neither means, leave that part of Config.h alone | 18 | # neither means, leave that part of Config.h alone |
19 | 19 | ||
20 | # Support building from pristine source | 20 | # Support building from pristine source |
21 | $make_opt = "-f $ARGV[0]/Makefile BB_SRC_DIR=$ARGV[0]" if ($ARGV[0] ne ""); | 21 | $make_opt = "-f $ARGV[0]/Makefile CONFIG_SRC_DIR=$ARGV[0]" if ($ARGV[0] ne ""); |
22 | 22 | ||
23 | # Move the config file to a safe place | 23 | # Move the config file to a safe place |
24 | -e "Config.h.orig" || 0==system("mv -f Config.h Config.h.orig") || die; | 24 | -e "Config.h.orig" || 0==system("mv -f Config.h Config.h.orig") || die; |
@@ -42,7 +42,7 @@ while (<C>) { | |||
42 | } | 42 | } |
43 | } | 43 | } |
44 | elsif ($in_features) { | 44 | elsif ($in_features) { |
45 | if (/^\/*#define BB_FEATURE_([A-Z0-9_]*)/) { | 45 | if (/^\/*#define CONFIG_FEATURE_([A-Z0-9_]*)/) { |
46 | push @features, $1; | 46 | push @features, $1; |
47 | } | 47 | } |
48 | if (/End of Features List/) { | 48 | if (/End of Features List/) { |
@@ -60,7 +60,7 @@ $failed_tests=0; | |||
60 | for $f (@features) { | 60 | for $f (@features) { |
61 | # print "Testing build with feature $f ...\n"; | 61 | # print "Testing build with feature $f ...\n"; |
62 | open (O, ">Config.h") || die; | 62 | open (O, ">Config.h") || die; |
63 | print O $header, "#define BB_FEATURE_$f\n", $trailer; | 63 | print O $header, "#define CONFIG_FEATURE_$f\n", $trailer; |
64 | close O; | 64 | close O; |
65 | system("echo -e '\n***\n$f\n***' >>$logfile"); | 65 | system("echo -e '\n***\n$f\n***' >>$logfile"); |
66 | # With a fast computer and 1-second resolution on file timestamps, this | 66 | # With a fast computer and 1-second resolution on file timestamps, this |