[embjopr-commits] EMBJOPR SVN: r815 - trunk/jsfunit/testdata.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-10-23 13:35:22 -0400 (Fri, 23 Oct 2009)
New Revision: 815

Modified:
   trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
 * hudson script: "--binary" ommited for Solaris 10 `patch`.

Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh	2009-10-23 13:51:04 UTC (rev 814)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh	2009-10-23 17:35:22 UTC (rev 815)
@@ -1,3 +1,13 @@
+
+##  OS-specific settings
+
+# --binary is used for Windows, which interpret \n as \r\n. Solaris 10 complains about it.
+PATCH_OPTS="--binary"
+if [ $OSTYPE == "solaris2.10" ] ; then PATCH_OPTS=""; fi
+
+
+
+
 ###  Clean embjopr dir
 echo `pwd`
 rm -rf embjopr/target
@@ -122,7 +132,7 @@
         echo "Running tests for part '$part'..."
         svn revert pom.xml
         echo "Performing 'patch -p0 < testdata/pom_patches/pom-$part.patch'..."
-        patch -p0 --binary < testdata/pom_patches/pom-$part.patch
+        patch -p0 $PATCH_OPTS < testdata/pom_patches/pom-$part.patch
         echo "Killing JBoss AS..."
         killJBossAS
         rm -rf target/jboss5x # Empty Cargo's configuration dir