diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-23 13:07:57 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-23 20:25:47 +0100 |
commit | 5b44ce39c6a3648682e241c75be513fb68c42568 (patch) | |
tree | 839f475b3ca17f74bdf0b80c91e905ff9362f2f0 /tests/gen-testsuite-part | |
parent | 2dfeef41c3a2045a6f54a75f710b8d7b930d4471 (diff) | |
download | automake-5b44ce39c6a3648682e241c75be513fb68c42568.tar.gz |
tests: quote 'like this', not `like this', as per GCS recommendation
This patch converts the automake testsuite and related files, to
the use of new quoting format 'like this' or "like this" rather
than `like this'.
This is done for consistency with the new recommendations in the GNU
Coding Standards, and, well, because I've come to actually prefer
the '...' and "..." quoting formats over the `...' one.
* tests/README: Update quoting format throughout. Remove some
"excessive" use of quoting, and throw in minor rewording where
appropriate.
* tests/Makefile.am: Likewise, for comments.
* tests/CheckListOfTests.am: Likewise.
* tests/defs-static.in: Likewise.
* tests/defs: Likewise.
* tests/trivial-test-driver: Likewise.
* Many tests/*.tap, tests/*.test and tests/*.sh files: Likewise,
and for the diagnostic and informational messages as well.
* tests/gen-testsuite-part: Likewise, and for the generated tests
as well.
Diffstat (limited to 'tests/gen-testsuite-part')
-rwxr-xr-x | tests/gen-testsuite-part | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/tests/gen-testsuite-part b/tests/gen-testsuite-part index 143cef083..42262f7f3 100755 --- a/tests/gen-testsuite-part +++ b/tests/gen-testsuite-part @@ -49,18 +49,18 @@ sub atomic_write ($$;$) my $tmpfile = "$outfile-t"; foreach my $f ($outfile, $tmpfile) { - unlink $f or die "$me: cannot unlink `$f': $!\n" + unlink $f or die "$me: cannot unlink '$f': $!\n" if -e $f; } open (my $fh, ">$tmpfile") - or die "$me: can't write to `$tmpfile': $!\n"; + or die "$me: can't write to '$tmpfile': $!\n"; $func->($fh); close $fh - or die "$me: closing `$tmpfile': $!\n"; + or die "$me: closing '$tmpfile': $!\n"; chmod ($perms & ~umask, $tmpfile) - or die "$me: cannot change perms for `$tmpfile': $!\n"; + or die "$me: cannot change perms for '$tmpfile': $!\n"; rename ($tmpfile, $outfile) - or die "$me: renaming `$tmpfile' -> `$outfile: $!\n'"; + or die "$me: renaming '$tmpfile' -> '$outfile: $!\n'"; } sub line_match ($$) @@ -69,7 +69,7 @@ sub line_match ($$) # Try both curdir and srcdir, with curdir first, to play nice # with VPATH builds. open (FH, "<$file") or open (FH, "<$srcdir/$file") - or die "$me: cannot open file `$file': $!\n"; + or die "$me: cannot open file '$file': $!\n"; my $ret = 0; while (defined (my $line = <FH>)) { @@ -79,7 +79,7 @@ sub line_match ($$) last; } } - close FH or die "$me: cannot close file `$file': $!\n"; + close FH or die "$me: cannot close file '$file': $!\n"; return $ret; } @@ -101,7 +101,7 @@ sub write_wrapper_script ($$$) . "\$dir/$wrapped_test"; exit "\$?" fi done - echo "\$0: cannot find wrapped test \\`$wrapped_test'" >&2 + echo "\$0: cannot find wrapped test '$wrapped_test'" >&2 exit '99' EOF } @@ -132,7 +132,7 @@ sub parse_options (@) local @ARGV = @_; GetOptions ('srcdir=s' => \$srcdir) or die "$me: usage error\n"; die "$me: too many arguments\n" if @ARGV > 0; - die "$me: srcdir `$srcdir': not a directory\n" unless -d $srcdir; + die "$me: srcdir '$srcdir': not a directory\n" unless -d $srcdir; } #-------------------------------------------------------------------------- @@ -189,18 +189,18 @@ my %test_generators = # # For each test script in the Automake testsuite that itself tests # features of the TESTS automake interface, define a sibling test - # that does likewise, but with the option `parallel-tests' enabled. + # that does likewise, but with the option 'parallel-tests' enabled. # # A test is considered a candidate for sibling-generation if any # Makefile.am generated by it define the TESTS variable. # # Individual tests can prevent the creation of such a sibling by - # explicitly setting the `$am_parallel_tests' variable to either "yes" + # explicitly setting the '$am_parallel_tests' variable to either "yes" # or "no". The rationale for this is that if the variable is set to - # "yes", the test already uses the `parallel-tests' option, so that + # "yes", the test already uses the 'parallel-tests' option, so that # a sibling would be just a duplicate; while if the variable is set # to "no", the test doesn't support, or is not meant to run with, the - # `parallel-tests' option, and forcing it to do so in the sibling + # 'parallel-tests' option, and forcing it to do so in the sibling # would likely cause a spurious failure. # parallel_testsuite_harness => @@ -214,17 +214,17 @@ my %test_generators = }, # # For each test script in the Automake testsuite that tests features - # of one or more automake-provided shell script from the `lib/' + # of one or more automake-provided shell script from the 'lib/' # subdirectory by running those scripts directly (i.e., not thought # make calls and automake-generated makefiles), define a sibling test # that does likewise, but running the said script with the configure # time $SHELL instead of the default system shell /bin/sh. # # A test is considered a candidate for sibling-generation if it calls - # the `get_shell_script' function anywhere. + # the 'get_shell_script' function anywhere. # # Individual tests can prevent the creation of such a sibling by - # explicitly setting the `$am_test_prefer_config_shell' variable + # explicitly setting the '$am_test_prefer_config_shell' variable # to either "yes" or "no". # The rationale for this is that if the variable is set to "yes", # the test already uses $SHELL, so that a sibling would be just a @@ -288,7 +288,7 @@ while (my ($k, $g) = each %test_generators) foreach my $wrapped_test (@wrapped_tests) { (my $base = $wrapped_test) =~ s/\.([^.]*)$//; - my $suf = $1 or die "$me: test `$wrapped_test' lacks a suffix\n"; + my $suf = $1 or die "$me: test '$wrapped_test' lacks a suffix\n"; my $wrapper_test = "$base-w.$suf"; # Register wrapper test as "autogenerated". push @generated_tests, $wrapper_test; @@ -379,7 +379,7 @@ map { print "generated_TESTS += $_\n" } @generated_tests; # The test scripts are scanned for automatic dependency generation *after* # the generated tests have been created, so they too can be scanned. To -# do so correctly, we need to update the list in `@all_tests' to make it +# do so correctly, we need to update the list in '@all_tests' to make it # comprise also the freshly-generated tests. push @all_tests, @generated_tests; @@ -398,7 +398,7 @@ while (my ($k, $x) = each %deps_extractor) my $nodist_prereqs = $x->{nodist_prereqs} || ""; my @tests = grep { line_match $x->{line_matcher}, $_ } @all_tests; map { s/\.[^.]*$//; s/$/\.log/; } (my @logs = @tests); - print "## Added by deps-extracting key `$k'.\n"; + print "## Added by deps-extracting key '$k'.\n"; ## The list of all tests which have a dependency detected by the ## current key. print join(" \\\n ", "${k}_TESTS =", @tests) . "\n"; @@ -407,5 +407,4 @@ while (my ($k, $x) = each %deps_extractor) print "\n"; } - __END__ |