test/tools/launcher/ChangeDataModel.sh
Print this page
@@ -27,10 +27,13 @@
# @summary Verify -d32 and -d64 options are accepted(rejected) on all platforms
# @author Joseph D. Darcy
OS=`uname -s`;
+# To remove CR from output, needed for java apps in CYGWIN, harmless otherwise
+SED_CR="sed -e 's@\\r@@g'"
+
case "$OS" in
Windows* | CYGWIN* )
PATHSEP=";"
;;
@@ -77,23 +80,23 @@
# All preconditions are met; run the tests.
# Verify data model flag for default data model is accepted
-DM=`$JAVA GetDataModel`
+DM=`$JAVA GetDataModel | ${SED_CR}`
case "$DM" in
32 )
- DM2=`${JAVA} -d32 GetDataModel`
+ DM2=`${JAVA} -d32 GetDataModel | ${SED_CR}`
if [ "${DM2}" != "32" ]
then
echo "Data model flag -d32 not accepted or had improper effect."
exit 1
fi
;;
64 )
- DM2=`${JAVA} -d64 GetDataModel`
+ DM2=`${JAVA} -d64 GetDataModel | ${SED_CR}`
if [ "${DM2}" != "64" ]
then
echo "Data model flag -d64 not accepted or had improper effect."
exit 1
fi
@@ -225,23 +228,23 @@
echo "Warning: no 64-bit components found; only one data model tested."
fi
else
# Negative tests for non-dual mode platforms to ensure the other data model is
# rejected
- DM=`$JAVA GetDataModel`
+ DM=`$JAVA GetDataModel | ${SED_CR}`
case "$DM" in
32 )
- DM2=`${JAVA} -d64 GetDataModel`
+ DM2=`${JAVA} -d64 GetDataModel | ${SED_CR}`
if [ "x${DM2}" != "x" ]
then
echo "Data model flag -d64 was accepted."
exit 1
fi
;;
64 )
- DM2=`${JAVA} -d32 GetDataModel`
+ DM2=`${JAVA} -d32 GetDataModel | ${SED_CR}`
if [ "x${DM2}" != "x" ]
then
echo "Data model flag -d32 was accepted."
exit 1
fi