tests: avoid a spurious failure on MSYS

[platform/upstream/automake.git] / gen-testsuite-part

diff --git a/gen-testsuite-part b/gen-testsuite-part
index 6ed1931..4584d2b 100755 (executable)
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -3,7 +3,7 @@
 # of the Automake testsuite.  Also, automatically generate some more
 # tests from them (for particular cases/setups only).
 
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -154,6 +154,11 @@ my %deps_extractor =
         line_matcher => qr/^\s*required=.*\bgettext/,
         nodist_prereqs => "$testdir/gettext-macros.log",
       },
+    pkgconfig_macros =>
+      {
+        line_matcher => qr/^\s*required=.*\bpkg-config/,
+        nodist_prereqs => "$testdir/pkg-config-macros.log",
+      },
     use_trivial_test_driver =>
       {
         line_matcher => qr/\btrivial-test-driver\b/,
@@ -308,7 +313,7 @@ while (my ($wrapped_test, $setup_list) = each %wrapper_setups)
         atomic_write $wrapper_test,
                      sub { write_wrapper_script $_[0], $wrapped_test,
                                                 $setup },
-                     0555;
+                     0444;
         # The generated test works by sourcing the original test, so that
         # it has to be re-run every time that changes ...
         print "$wbase.log: $wrapped_test\n";
@@ -340,8 +345,11 @@ my %depmodes =
     makedepend   => ["cc", "makedepend"],
     dashmstdout  => ["gcc"],
     cpp          => ["gcc"],
-# This is for older (pre-3.x) GCC versions.  Newer versions
-# have depmode "gcc3".
+# This was for older (pre-3.x) GCC versions (newer versions
+# have depmode "gcc3").  But other compilers use this depmode
+# as well (for example, the IMB xlc/xlC compilers, and the HP
+# C compiler, see 'lib/depcomp' for more info), so it's not
+# obsolete, and it's worth giving it some coverage.
     gcc          => ["gcc"],
 # This is for older (pre-7) msvc versions.  Newer versions
 # have depmodes "msvc7" and "msvc7msys".
@@ -377,13 +385,13 @@ foreach my $lt (TRUE, FALSE)
               # Automatically generated test.  DO NOT EDIT BY HAND!
               @vars_init
               required="@required"
-              . ./defs || exit 1
+              . test-init.sh
               plan_ $planned
               . depcomp.sh
               exit \$?
 EOF
           },
-          0555);
+          0444);
       }
    }