diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-10-07 11:08:15 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-10-07 11:42:06 +0200 |
| commit | ba0c477b275aaae0e4f77003ac96f4cc2ec12ebf (patch) | |
| tree | 38eec9d58bea330505e98998af92695c29c82624 /automake.in | |
| parent | d710255c09afd2d6e06d72259816988a0a79ea18 (diff) | |
| download | automake-ba0c477b275aaae0e4f77003ac96f4cc2ec12ebf.tar.gz | |
parallel-tests: warn on conditional TEST_EXTENSIONS definition
Before this change, automake would have still bailed out, but
with a confusing error message (about an invalid redefinition
of TEST_EXTENSIONS).
* automake.in (handle_tests): Warn explicitly if TEST_EXTENSIONS
has conditional contents.
* tests/test-extensions-con.test: New test.
* tests/Makefile.am (TESTS): Add it.
* NEWS: Update.
Diffstat (limited to 'automake.in')
| -rwxr-xr-x | automake.in | 15 |
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) |