20373716 Cleanup regexp expressions for normalizing cc / libtool lines in test files
authorRich Burridge <rich.burridge@oracle.com>
Wed, 21 Jan 2015 07:59:43 -0800
changeset 3659 2110c4baed8f
parent 3656 26201c994a65
child 3660 46ba63335db4
20373716 Cleanup regexp expressions for normalizing cc / libtool lines in test files
components/libconfuse/Makefile
components/libconfuse/test/results-all.master
components/libssh2/Makefile
components/libssh2/test/results-all.master
components/python/simplejson/Makefile
components/python/simplejson/test/results-2.7-32.master
components/python/simplejson/test/results-2.7-64.master
components/xz/Makefile
components/xz/test/results-all.master
--- a/components/libconfuse/Makefile	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/libconfuse/Makefile	Wed Jan 21 07:59:43 2015 -0800
@@ -52,11 +52,9 @@
 
 # The additional libconfuse specific set of transforms to be applied to the
 # test results to try to normalize them.
-# The cc and libtool lines need to be deleted because x86 and SPARC have
-# different line arguments.
 COMPONENT_TEST_TRANSFORMS += \
-	'-e "/^\/ws\/on12-tools\/SUNWspro\/solarisstudio12.3\/bin\/cc/d" ' \
-	'-e "/^\/bin\/bash ..\/libtool/d" '
+	'-e "s|\(^$(CC)\).*|\\$$(CC)|" ' \
+	'-e "s|\(^/bin/bash ../libtool\).*|\1|" '
 
 ASLR_MODE = $(ASLR_ENABLE)
 
--- a/components/libconfuse/test/results-all.master	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/libconfuse/test/results-all.master	Wed Jan 21 07:59:43 2015 -0800
@@ -22,39 +22,66 @@
 source='suite_single.c' object='suite_single.o' libtool=no \
 depfile='.deps/suite_single.Po' tmpdepfile='.deps/suite_single.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
 mkdir .libs
+$(CC)
 creating suite_single
 source='suite_dup.c' object='suite_dup.o' libtool=no \
 depfile='.deps/suite_dup.Po' tmpdepfile='.deps/suite_dup.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
+$(CC)
 creating suite_dup
 source='suite_func.c' object='suite_func.o' libtool=no \
 depfile='.deps/suite_func.Po' tmpdepfile='.deps/suite_func.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
+$(CC)
 creating suite_func
 source='suite_list.c' object='suite_list.o' libtool=no \
 depfile='.deps/suite_list.Po' tmpdepfile='.deps/suite_list.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
+$(CC)
 creating suite_list
 source='suite_validate.c' object='suite_validate.o' libtool=no \
 depfile='.deps/suite_validate.Po' tmpdepfile='.deps/suite_validate.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
+$(CC)
 creating suite_validate
 source='list_plus_syntax.c' object='list_plus_syntax.o' libtool=no \
 depfile='.deps/list_plus_syntax.Po' tmpdepfile='.deps/list_plus_syntax.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
+$(CC)
 creating list_plus_syntax
 source='section_title_dupes.c' object='section_title_dupes.o' libtool=no \
 depfile='.deps/section_title_dupes.Po' tmpdepfile='.deps/section_title_dupes.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
+$(CC)
 creating section_title_dupes
 source='single_title_sections.c' object='single_title_sections.o' libtool=no \
 depfile='.deps/single_title_sections.Po' tmpdepfile='.deps/single_title_sections.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
+$(CC)
 creating single_title_sections
 source='quote_before_print.c' object='quote_before_print.o' libtool=no \
 depfile='.deps/quote_before_print.Po' tmpdepfile='.deps/quote_before_print.TPo' \
 depmode=none /bin/bash $(SOURCE_DIR)/support/depcomp \
+$(CC)
+/bin/bash ../libtool
+$(CC)
 creating quote_before_print
 make[3]: Leaving directory `$(@D)/tests'
 /usr/gnu/bin/make  check-TESTS
--- a/components/libssh2/Makefile	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/libssh2/Makefile	Wed Jan 21 07:59:43 2015 -0800
@@ -55,12 +55,10 @@
 
 # The additional libssh2 specific set of transforms to be applied to the
 # test results to try to normalize them.
-# The cc and libtool lines need to be deleted because x86 and SPARC have
-# different command line arguments.
 COMPONENT_TEST_TRANSFORMS += \
-	'-e "/^\/ws\/on12-tools\/SUNWspro\/solarisstudio12.3\/bin\/cc/d" ' \
-	'-e "/^\/bin\/bash ..\/libtool/d" ' \
-	'-e "/^libtool: link:/d" '
+	'-e "s|\(^$(CC)\).*|\\$$(CC)|" ' \
+	'-e "s|\(^/bin/bash ../libtool\).*|\1|" ' \
+	'-e "s|\(^libtool: link:\).*|\1|" '
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
--- a/components/libssh2/test/results-all.master	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/libssh2/test/results-all.master	Wed Jan 21 07:59:43 2015 -0800
@@ -8,6 +8,9 @@
 make[3]: Entering directory `$(@D)/tests'
 source='$(SOURCE_DIR)/tests/simple.c' object='simple.o' libtool=no \
 DEPDIR=.deps depmode=none /bin/bash $(SOURCE_DIR)/depcomp \
+$(CC)
+/bin/bash ../libtool
+libtool: link:
 make[3]: Leaving directory `$(@D)/tests'
 /usr/gnu/bin/make  check-TESTS
 make[3]: Entering directory `$(@D)/tests'
--- a/components/python/simplejson/Makefile	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/python/simplejson/Makefile	Wed Jan 21 07:59:43 2015 -0800
@@ -51,11 +51,9 @@
 
 # The additional simplejson specific set of transforms to be applied
 # to the test results to try to normalize them.
-# The cc lines need to be deleted because x86 and SPARC have different
-# compile line arguments.
 COMPONENT_TEST_TRANSFORMS += \
-	'-e "/^\/ws\/on12-tools\/SUNWspro\/solarisstudio12.3\/bin\/cc/d" ' \
-	'-e "/^cc -G /d" ' \
+	'-e "s|\(^$(CC)\).*|\\$$(CC)|" ' \
+	'-e "s|\(^cc -G \).*|\1|" ' \
 	'-e "s|\(creating build/temp.solaris\).*|\1|" ' \
 	'-e "s|\(Ran 132 tests in\).*|\1|" '
 
--- a/components/python/simplejson/test/results-2.7-32.master	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/python/simplejson/test/results-2.7-32.master	Wed Jan 21 07:59:43 2015 -0800
@@ -10,6 +10,8 @@
 creating build
 creating build/temp.solaris
 creating build/temp.solaris
+$(CC)
+cc -G 
 test_circular_composite (simplejson.tests.test_check_circular.TestCheckCircular) ... ok
 test_circular_default (simplejson.tests.test_check_circular.TestCheckCircular) ... ok
 test_circular_dict (simplejson.tests.test_check_circular.TestCheckCircular) ... ok
--- a/components/python/simplejson/test/results-2.7-64.master	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/python/simplejson/test/results-2.7-64.master	Wed Jan 21 07:59:43 2015 -0800
@@ -9,7 +9,9 @@
 building 'simplejson._speedups' extension
 creating build/temp.solaris
 creating build/temp.solaris
+$(CC)
 creating $(SOURCE_DIR)/simplejson/64
+cc -G 
 test_circular_composite (simplejson.tests.test_check_circular.TestCheckCircular) ... ok
 test_circular_default (simplejson.tests.test_check_circular.TestCheckCircular) ... ok
 test_circular_dict (simplejson.tests.test_check_circular.TestCheckCircular) ... ok
--- a/components/xz/Makefile	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/xz/Makefile	Wed Jan 21 07:59:43 2015 -0800
@@ -48,12 +48,10 @@
 
 # The additional xz specific set of transforms to be applied to the
 # test results to try to normalize them.
-# The cc and libtool lines need to be deleted because x86 and SPARC have
-# different line arguments.
 COMPONENT_TEST_TRANSFORMS += \
-	'-e "/^\/ws\/on12-tools\/SUNWspro\/solarisstudio12.3\/bin\/cc/d" ' \
-	'-e "/^\/bin\/bash ..\/libtool/d" ' \
-	'-e "/^libtool: link:/d" '
+	'-e "s|\(^$(CC)\).*|\\$$(CC)|" ' \
+	'-e "s|\(^/bin/bash ../libtool\).*|\1|" ' \
+	'-e "s|\(^libtool: link:\).*|\1|" '
 
 ASLR_MODE = $(ASLR_ENABLE)
 
--- a/components/xz/test/results-all.master	Tue Jan 20 17:57:37 2015 -0800
+++ b/components/xz/test/results-all.master	Wed Jan 21 07:59:43 2015 -0800
@@ -3,16 +3,34 @@
 make[2]: Entering directory `$(@D)/tests'
 source='$(SOURCE_DIR)/tests/create_compress_files.c' object='create_compress_files.o' libtool=no \
 DEPDIR=.deps depmode=none /bin/bash $(SOURCE_DIR)/build-aux/depcomp \
+$(CC)
+/bin/bash ../libtool
+libtool: link:
 source='$(SOURCE_DIR)/tests/test_check.c' object='test_check.o' libtool=no \
 DEPDIR=.deps depmode=none /bin/bash $(SOURCE_DIR)/build-aux/depcomp \
+$(CC)
+/bin/bash ../libtool
+libtool: link:
 source='$(SOURCE_DIR)/tests/test_stream_flags.c' object='test_stream_flags.o' libtool=no \
 DEPDIR=.deps depmode=none /bin/bash $(SOURCE_DIR)/build-aux/depcomp \
+$(CC)
+/bin/bash ../libtool
+libtool: link:
 source='$(SOURCE_DIR)/tests/test_filter_flags.c' object='test_filter_flags.o' libtool=no \
 DEPDIR=.deps depmode=none /bin/bash $(SOURCE_DIR)/build-aux/depcomp \
+$(CC)
+/bin/bash ../libtool
+libtool: link:
 source='$(SOURCE_DIR)/tests/test_block_header.c' object='test_block_header.o' libtool=no \
 DEPDIR=.deps depmode=none /bin/bash $(SOURCE_DIR)/build-aux/depcomp \
+$(CC)
+/bin/bash ../libtool
+libtool: link:
 source='$(SOURCE_DIR)/tests/test_index.c' object='test_index.o' libtool=no \
 DEPDIR=.deps depmode=none /bin/bash $(SOURCE_DIR)/build-aux/depcomp \
+$(CC)
+/bin/bash ../libtool
+libtool: link:
 make[2]: Leaving directory `$(@D)/tests'
 /usr/gnu/bin/make  check-TESTS
 make[2]: Entering directory `$(@D)/tests'