# HG changeset patch
# User naoki.tanaka@oracle.com <naoki.tanaka@oracle.com>
# Date 1441297456 25200
# Node ID 5c4d5a9885ccde766178e0fd1d1ffb8e7709cf1f
# Parent  2963a732ee80d85b4539130dc5241f6bdfaeda5a
21757228 libmd.so check in sudo Makefile fails
19859344 The sudo test: target in the component Makefile could do a standard "gmake test"
20461166 SUDO should have some master test results to compare against

diff -r 2963a732ee80 -r 5c4d5a9885cc components/sudo/Makefile
--- a/components/sudo/Makefile	Wed Sep 02 14:24:30 2015 -0700
+++ b/components/sudo/Makefile	Thu Sep 03 09:24:16 2015 -0700
@@ -72,23 +72,20 @@
 COMPONENT_INSTALL_ARGS += bindir=$(USRBINDIR)
 COMPONENT_INSTALL_ARGS += sbindir=$(USRSBINDIR)
 
-# Since linking with libmd.so (which provides sha2 capability on
-# Solaris) is optional, we have a check here to make sure that the
-# configure script found it correctly.
+# Make sure that sudo is NOT built with its internal sha2 implementation
 # http://www.sudo.ws/bugs/show_bug.cgi?id=641
-# Make sure that sudo is NOT built with its internal sha2 implementation
-# ... but is linked with libmd instead
 COMPONENT_TEST_ENV_CMD =
 COMPONENT_TEST_CMD = \
 	if [[ -n $$( elfdump -s "$(VISUDO)" | grep SHA256Init | grep -v UNDEF ) ]]; then \
 		echo "SHA256Init is not an undefined symbol in $(VISUDO)"; \
 		exit 1; \
 	fi; \
-	if [[ -z $$( elfdump -d "$(VISUDO)" | grep 'NEEDED .* libmd.so' ) ]]; then \
-		echo "$(VISUDO) is not linked against libmd.so"; \
-		exit 1; \
-	fi
-COMPONENT_TEST_TARGETS =
+	$(GMAKE)
+
+# Tests may output some compilation lines, so just pull out the relevant test
+# output lines for the test results comparison
+COMPONENT_TEST_TRANSFORMS += '-e "/^sudo_conf\|^sudo_parseln\|^check_addr\|^check_base64\|^check_fill\|^iolog_path\|^check_symbols\|^sudoers\|^testsudoers\|^visudo\|^check_ttyname/!d"'
+COMPONENT_TEST_TRANSFORMS += '-e "s/\(\/dev\/pts\/\)[0-9][0-9]*/\1\#/"'
 
 # Enable aslr for this component
 ASLR_MODE = $(ASLR_ENABLE)
diff -r 2963a732ee80 -r 5c4d5a9885cc components/sudo/test/results-64.master
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sudo/test/results-64.master	Thu Sep 03 09:24:16 2015 -0700
@@ -0,0 +1,62 @@
+sudo_conf/test1: OK
+sudo_conf/test2: OK
+sudo_conf/test3: OK
+sudo_conf/test4: OK
+sudo_conf/test5: OK
+sudo_conf/test6: OK
+sudo_parseln/test1: OK
+sudo_parseln/test2: OK
+sudo_parseln/test3: OK
+sudo_parseln/test4: OK
+sudo_parseln/test5: OK
+sudo_parseln/test6: OK
+sudo_parseln: 13/13 tests passed; 0/13 tests failed
+check_addr: 9 tests run, 0 errors, 100% success rate
+check_base64: 5 tests run, 0 errors, 100% success rate
+check_fill: 18 tests run, 0 errors, 100% success rate
+iolog_path: 8 tests run, 0 errors, 100% success rate
+check_symbols: 7 tests run, 0 errors, 100% success rate
+sudoers/test1 (parse): OK
+sudoers/test1 (toke):  OK
+sudoers/test10 (parse): OK
+sudoers/test10 (toke):  OK
+sudoers/test11 (parse): OK
+sudoers/test11 (toke):  OK
+sudoers/test12 (parse): OK
+sudoers/test12 (toke):  OK
+sudoers/test13 (parse): OK
+sudoers/test13 (toke):  OK
+sudoers/test14 (parse): OK
+sudoers/test14 (toke):  OK
+sudoers/test2 (parse): OK
+sudoers/test2 (toke):  OK
+sudoers/test3 (parse): OK
+sudoers/test3 (toke):  OK
+sudoers/test4 (parse): OK
+sudoers/test4 (toke):  OK
+sudoers/test5 (parse): OK
+sudoers/test5 (toke):  OK
+sudoers/test6 (parse): OK
+sudoers/test6 (toke):  OK
+sudoers/test7 (parse): OK
+sudoers/test7 (toke):  OK
+sudoers/test8 (parse): OK
+sudoers/test8 (toke):  OK
+sudoers/test9 (parse): OK
+sudoers/test9 (toke):  OK
+sudoers: 28/28 tests passed; 0/28 tests failed
+testsudoers/test1: OK
+testsudoers/test2: OK
+testsudoers/test3: OK
+testsudoers/test4: OK
+testsudoers/test5: OK
+testsudoers: 5/5 tests passed; 0/5 tests failed
+visudo/test1: OK
+visudo/test2: OK
+visudo/test2 (stderr): OK
+visudo/test3: OK
+visudo/test3 (stderr): OK
+visudo/test4: OK
+visudo/test5: OK
+visudo: 7/7 tests passed; 0/7 tests failed
+check_ttyname: OK (/dev/pts/#)