[gawk-diffs] [SCM] gawk branch, cmake, updated. b6dbba36f373166e14cad2767b89d0331b8ac77c

[Juergen Kahrs]

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 "gawk".

The branch, cmake has been updated
       via  b6dbba36f373166e14cad2767b89d0331b8ac77c (commit)
      from  291ff169ddc21abd09e1b46c69eddd56edd31899 (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=b6dbba36f373166e14cad2767b89d0331b8ac77c

commit b6dbba36f373166e14cad2767b89d0331b8ac77c
Author: Juergen Kahrs <address@hidden>
Date:   Mon Apr 29 18:14:06 2013 +0200

    When building with a native MinGW for Win32 it is now possible to run a 
'make test'; only 90% of the basic test cases pass.

diff --git a/cmake/basictest b/cmake/basictest
index 42cb286..95b98a1 100755
--- a/cmake/basictest
+++ b/cmake/basictest
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+export PATH=$PATH:/c/MinGW/msys/1.0/bin
 TESTHOME=$(dirname ${0})/../test
 export AWKPATH=${TESTHOME}
 export AWKLIBPATH=${TESTHOME}/../build/extension/
@@ -10,5 +11,13 @@ then
 else
   $1 $3 -f ${2}.awk                        > ${TESTHOME}/_${2} 2>&1 || echo 
EXIT CODE: $? >> ${TESTHOME}/_${2}
 fi
-cmp ${TESTHOME}/${2}.ok ${TESTHOME}/_${2} && rm -f ${TESTHOME}/_${2}
+# Is this shell running in a native MinGW shell (MSYS) ?
+if test -n "$COMSPEC"; then
+  # Ignore all differences in white space.
+  COMPARE="diff -w"
+else
+  # This is a shell running in Unix environment.
+  COMPARE="cmp"
+fi
+${COMPARE} ${TESTHOME}/${2}.ok ${TESTHOME}/_${2} && rm -f ${TESTHOME}/_${2}
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 96008d5..14d75f6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,6 +24,10 @@
 
 ## process this file with CMake to produce Makefile
 
+if(WIN32)
+  set(SHELL_PREFIX "C:\\MinGW\\msys\\1.0\\bin\\sh")
+endif()
+
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/Maketests BASIC_TESTS)
 string(REGEX REPLACE "^Gt-dummy:\n"   "" BASIC_TESTS "${BASIC_TESTS}")
 string(REGEX MATCHALL "[a-zA-Z0-9_]+:\n" BASIC_TESTS "${BASIC_TESTS}")
@@ -42,6 +46,6 @@ foreach(testcase ${BASIC_TESTS} )
     set(options "--lint")
   endif()
 
-  add_test(${testcase} ${CMAKE_SOURCE_DIR}/cmake/basictest 
${CMAKE_BINARY_DIR}/gawk ${testcase}  ${options} )
+  add_test(${testcase} ${SHELL_PREFIX} ${CMAKE_SOURCE_DIR}/cmake/basictest 
${CMAKE_BINARY_DIR}/gawk ${testcase}  ${options} )
 endforeach(testcase)
 

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

Summary of changes:
 cmake/basictest     |   11 ++++++++++-
 test/CMakeLists.txt |    6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
gawk