8005575: build-infra: Three JCK tests fails on Solaris with new RE Autoconf-Based build
Reviewed-by: ohair
--- a/common/autoconf/compare.sh.in Thu Jan 03 20:54:38 2013 +0100
+++ b/common/autoconf/compare.sh.in Fri Jan 04 11:31:00 2013 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap"
LDD="@LDD@"
MKDIR="@MKDIR@"
+NAWK="@NAWK@"
NM="@NM@"
OBJDUMP="@OBJDUMP@"
OTOOL="@OTOOL@"
--- a/common/bin/compare.sh Thu Jan 03 20:54:38 2013 +0100
+++ b/common/bin/compare.sh Fri Jan 04 11:31:00 2013 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -113,12 +113,15 @@
fi
fi
if test "x$SUFFIX" = "xproperties"; then
- $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
- | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
- | $SED -e '/^#/d' -e '/^$/d' \
- -e :a -e '/\\$/N; s/\\\n//; ta' \
- -e 's/^[ \t]*//;s/[ \t]*$//' \
- -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
+ # Run through nawk to add possibly missing newline at end of file.
+ $CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned
+# Disable this exception since we aren't changing the properties cleaning method yet.
+# $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
+# | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
+# | $SED -e '/^#/d' -e '/^$/d' \
+# -e :a -e '/\\$/N; s/\\\n//; ta' \
+# -e 's/^[ \t]*//;s/[ \t]*$//' \
+# -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
fi
if test -n "$TMP"; then