[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1701-g317e6ca

[Peter Rosin]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=317e6ca3cea900d1f401c27814cf672303aa813a

The branch, master has been updated
       via  317e6ca3cea900d1f401c27814cf672303aa813a (commit)
      from  8f76fd511ed794810a7cff4d6043e1cdc6255754 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 317e6ca3cea900d1f401c27814cf672303aa813a
Author: Peter Rosin <address@hidden>
Date:   Thu Jan 5 10:45:16 2012 +0100

    tests: work around strangeness in MSYS
    
    MSYS mishandles carriage returns and behaves very strangely for
    directories with colon in them.  It seems that colon-directories are
    somehow mixed up with drive letters.
    
    Fixes automake bug#7849.
    
    * tests/instspc.tap: Skip instead of erroring out when $test_string
    is empty for the carriageret case, as that is expected on MSYS.  Also,
    for similar reasons, skip instead of erroring out when it is not
    possible to cd into the just created directory, and the directory
    name contains a colon.  Update copyright years.

-----------------------------------------------------------------------

Summary of changes:
 tests/instspc.tap |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/tests/instspc.tap b/tests/instspc.tap
index 9eb145f..914b36c 100755
--- a/tests/instspc.tap
+++ b/tests/instspc.tap
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011, 2012 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
@@ -235,9 +235,20 @@ create_input_data
 for test_name in $test_names_list; do
 
   eval "test_string=\${instspc__$test_name}" \
-    && test x"$test_string" != x \
     || fatal_ "invalid test name: '$test_name'"
 
+  if test x"$test_string" = x; then
+    if test x"$test_name" != xcarriageret; then
+      fatal_ "invalid test name: '$test_name'"
+    else
+      # MSYS version 1.0.17 still mishandles carriage returns; see
+      # automake bug#7849.
+      skip_ -r "carriage-return treated as null char" "$test_name in builddir"
+      skip_ -r "carriage-return treated as null char" "$test_name in destdir"
+      continue
+    fi
+  fi
+
   # Skip the next checks if this system doesn't support the required
   # characters in file names.
 
@@ -247,6 +258,21 @@ for test_name in $test_names_list; do
     continue
   }
 
+  case $test_string in
+  *:*)
+    # On MSYS 1.0.17, "mkdir ./a:" creates ./a, and "cd ./a:" takes you
+    # to a strange directory with pwd equal to "a".  But only for
+    # interactive shells.  Or something?  In this script, "cd ./a:" fails
+    # on MSYS.  Marvelous.
+    ( cd "./$test_string" ) || {
+      rmdir "./$test_string" || fatal_ "removing directory"
+      skip_ -r "cd failed" "$test_name in builddir"
+      skip_ -r "cd failed" "$test_name in destdir"
+      continue
+    }
+    ;;
+  esac
+
   # Where are the "weird" characters going to be used, in $(builddir)
   # or in $(DESTDIR)?  They are always going to be used in $(prefix)
   # though; should we maybe separate this into a dedicated check?


hooks/post-receive
-- 
GNU Automake