21608810 gawk and cvs need system-test hooked up
authorCraig Mohrman <craig.mohrman@oracle.com>
Wed, 12 Aug 2015 17:37:30 -0700
changeset 4770 b4623be47e9d
parent 4769 70480c18ca65
child 4773 66779b2d691b
21608810 gawk and cvs need system-test hooked up
components/cvs/Makefile
components/cvs/test/results-64.master
components/gawk/Makefile
components/gawk/patches/Makefile_in.patch
--- a/components/cvs/Makefile	Wed Aug 05 15:22:29 2015 -0700
+++ b/components/cvs/Makefile	Wed Aug 12 17:37:30 2015 -0700
@@ -46,12 +46,25 @@
 # Enable ASLR for this component
 ASLR_MODE = $(ASLR_ENABLE)
 
+# need gnu grep
+COMPONENT_TEST_ENV += PATH=$(GNUBIN):$(PATH)
 # "check" is not working yet.  It's asking for a password.
-COMPONENT_TEST_ENV += PATH=$(GNUBIN):$(PATH)
 COMPONENT_TEST_TARGETS = localcheck
 
-# Test transforms to cut out randomly-ordered test messages
-COMPONENT_TEST_TRANSFORMS += '-e "/^cp.*/d" ' \
+# mimic localcheck from src/Makefile
+COMPONENT_SYSTEM_TEST_DIR = $(SOURCE_DIR)/src
+COMPONENT_SYSTEM_TEST_ENV += PATH=$(GNUBIN):$(PATH)
+COMPONENT_SYSTEM_TEST_CMD = ./sanity.sh
+COMPONENT_SYSTEM_TEST_ARGS = /usr/bin/cvs
+COMPONENT_SYSTEM_TEST_TARGETS =
+
+# extract just the final results
+# delete make lines
+# delete cp lines
+COMPONENT_TEST_TRANSFORMS += \
+	'-e "/^This/,/^make/!d" ' \
+	'-e "/^[mM]ake/d" ' \
+	'-e "/^cp.*/d" '
 
 configure:	$(CONFIGURE_64)
 
@@ -61,7 +74,7 @@
 
 test:		$(TEST_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+system-test:	$(SYSTEM_TEST_64)
 
 
 REQUIRED_PACKAGES += library/zlib
--- a/components/cvs/test/results-64.master	Wed Aug 05 15:22:29 2015 -0700
+++ b/components/cvs/test/results-64.master	Wed Aug 12 17:37:30 2015 -0700
@@ -1,92 +1,6 @@
-make[1]: Entering directory `$(@D)'
-/usr/gnu/bin/make  all-recursive
-make[2]: Entering directory `$(@D)'
-Making all in lib
-make[3]: Entering directory `$(@D)/lib'
-/usr/gnu/bin/make  all-am
-make[4]: Entering directory `$(@D)/lib'
-make[4]: Nothing to be done for `all-am'.
-make[4]: Leaving directory `$(@D)/lib'
-make[3]: Leaving directory `$(@D)/lib'
-Making all in diff
-make[3]: Entering directory `$(@D)/diff'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/diff'
-Making all in src
-make[3]: Entering directory `$(@D)/src'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/src'
-Making all in man
-make[3]: Entering directory `$(@D)/man'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/man'
-Making all in doc
-make[3]: Entering directory `$(@D)/doc'
-Making all in i18n
-make[4]: Entering directory `$(@D)/doc/i18n'
-Making all in pt_BR
-make[5]: Entering directory `$(@D)/doc/i18n/pt_BR'
-make[5]: Nothing to be done for `all'.
-make[5]: Leaving directory `$(@D)/doc/i18n/pt_BR'
-make[5]: Entering directory `$(@D)/doc/i18n'
-make[5]: Nothing to be done for `all-am'.
-make[5]: Leaving directory `$(@D)/doc/i18n'
-make[4]: Leaving directory `$(@D)/doc/i18n'
-make[4]: Entering directory `$(@D)/doc'
-make[4]: Nothing to be done for `all-am'.
-make[4]: Leaving directory `$(@D)/doc'
-make[3]: Leaving directory `$(@D)/doc'
-Making all in contrib
-make[3]: Entering directory `$(@D)/contrib'
-Making all in pam
-make[4]: Entering directory `$(@D)/contrib/pam'
-make[4]: Nothing to be done for `all'.
-make[4]: Leaving directory `$(@D)/contrib/pam'
-make[4]: Entering directory `$(@D)/contrib'
-make[4]: Nothing to be done for `all-am'.
-make[4]: Leaving directory `$(@D)/contrib'
-make[3]: Leaving directory `$(@D)/contrib'
-Making all in tools
-make[3]: Entering directory `$(@D)/tools'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/tools'
-Making all in windows-NT
-make[3]: Entering directory `$(@D)/windows-NT'
-Making all in SCC
-make[4]: Entering directory `$(@D)/windows-NT/SCC'
-make[4]: Nothing to be done for `all'.
-make[4]: Leaving directory `$(@D)/windows-NT/SCC'
-make[4]: Entering directory `$(@D)/windows-NT'
-make[4]: Nothing to be done for `all-am'.
-make[4]: Leaving directory `$(@D)/windows-NT'
-make[3]: Leaving directory `$(@D)/windows-NT'
-Making all in os2
-make[3]: Entering directory `$(@D)/os2'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/os2'
-Making all in emx
-make[3]: Entering directory `$(@D)/emx'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/emx'
-Making all in vms
-make[3]: Entering directory `$(@D)/vms'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/vms'
-Making all in maint-aux
-make[3]: Entering directory `$(@D)/maint-aux'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/maint-aux'
-make[3]: Entering directory `$(@D)'
-make[3]: Leaving directory `$(@D)'
-make[2]: Leaving directory `$(@D)'
-cd src && /usr/gnu/bin/make  "localcheck"
-make[2]: Entering directory `$(@D)/src'
-/bin/sh $(SOURCE_DIR)/src/sanity.sh `pwd`/cvs
 This test should produce no other output than this message, and a final "OK".
 (Note that the test can take an hour or more to run and periodically stops
 for as long as one minute.  Do not assume there is a problem just because
 nothing seems to happen for a long time.  If you cannot live without
 running status, try the command: `tail -f check.log' from another window.)
 OK, all 3578 tests passed (11 test groups skipped).
-make[2]: Leaving directory `$(@D)/src'
-make[1]: Leaving directory `$(@D)'
--- a/components/gawk/Makefile	Wed Aug 05 15:22:29 2015 -0700
+++ b/components/gawk/Makefile	Wed Aug 12 17:37:30 2015 -0700
@@ -50,9 +50,11 @@
 CONFIGURE_OPTIONS	+=	--libexecdir=$(CONFIGURE_LIBDIR.$(BITS))
 CONFIGURE_OPTIONS	+=	CFLAGS="$(CFLAGS)"
 
+COMPONENT_SYSTEM_TEST_ARGS = AWKPROG=/usr/bin/gawk
+
 ASLR_MODE = $(ASLR_ENABLE)
 
-# common targets
+
 configure:	$(CONFIGURE_64)
 
 build:		$(BUILD_64)
@@ -61,7 +63,8 @@
 
 test:		$(TEST_64)
 
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+# must build tests before using
+system-test:    build $(SYSTEM_TEST_64)
 
 
 REQUIRED_PACKAGES += library/libsigsegv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gawk/patches/Makefile_in.patch	Wed Aug 12 17:37:30 2015 -0700
@@ -0,0 +1,21 @@
+Internally produced patch to allow both test and system-test to work.
+Will offer to upstream.
+
+
+--- gawk-3.1.8/test/Makefile.in_orig	2015-08-03 15:16:05.007746388 -0700
++++ gawk-3.1.8/test/Makefile.in	2015-08-03 15:16:57.152891167 -0700
[email protected]@ -1187,12 +1187,12 @@
+ # so this can still fail
+ poundbang::
+ 	@echo [email protected]
+-	@sed "s;/tmp/gawk;`pwd`/$(AWKPROG);" < $(srcdir)/poundbang.awk > ./_pbd.awk
++	@sed "s;/tmp/gawk;$(AWKPROG);" < $(srcdir)/poundbang.awk > ./_pbd.awk
+ 	@chmod +x ./_pbd.awk
+ 	@if ./_pbd.awk $(srcdir)/poundbang.awk > _`basename [email protected]` ; \
+ 	then : ; \
+ 	else \
+-		sed "s;/tmp/gawk;../$(AWKPROG);" < $(srcdir)/poundbang.awk > ./_pbd.awk ; \
++		sed "s;/tmp/gawk;$(AWKPROG);" < $(srcdir)/poundbang.awk > ./_pbd.awk ; \
+ 		chmod +x ./_pbd.awk ; \
+ 		LC_ALL=$${GAWKLOCALE:-C} LANG=$${GAWKLOCALE:-C} ./_pbd.awk $(srcdir)/poundbang.awk > _`basename [email protected]`;  \
+ 	fi