summaryrefslogtreecommitdiff
path: root/automake.in
diff options
context:
space:
mode:
Diffstat (limited to 'automake.in')
-rwxr-xr-xautomake.in15
1 files changed, 12 insertions, 3 deletions
diff --git a/automake.in b/automake.in
index 0080df815..516e594c1 100755
--- a/automake.in
+++ b/automake.in
@@ -4982,9 +4982,18 @@ sub handle_tests
$at_exeext = subst ('EXEEXT');
$suff = $at_exeext . ' ' . $suff;
}
- define_variable ('TEST_EXTENSIONS', $suff, INTERNAL);
- # FIXME: this mishandles conditions.
- my $var = rvar 'TEST_EXTENSIONS';
+ if (! var 'TEST_EXTENSIONS')
+ {
+ define_variable ('TEST_EXTENSIONS', $suff, INTERNAL);
+ }
+ my $var = var 'TEST_EXTENSIONS';
+ # Currently, we are not able to deal with conditional contents
+ # in TEST_EXTENSIONS.
+ if ($var->has_conditional_contents)
+ {
+ msg_var 'unsupported', $var,
+ "`TEST_EXTENSIONS' cannot have conditional contents";
+ }
my @test_suffixes = $var->value_as_list_recursive;
if ((my @invalid_test_suffixes =
grep { !is_valid_test_extension $_ } @test_suffixes) > 0)