From owner-svn-ports-branches@freebsd.org Mon Mar 9 18:25:08 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D748326994D; Mon, 9 Mar 2020 18:25:08 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48bmq81dGMz420p; Mon, 9 Mar 2020 18:25:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6803BEF3E; Mon, 9 Mar 2020 18:25:07 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 029IP7Hd088079; Mon, 9 Mar 2020 18:25:07 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 029IP62h088076; Mon, 9 Mar 2020 18:25:06 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202003091825.029IP62h088076@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 9 Mar 2020 18:25:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r528114 - in branches/2020Q1/devel/nspr: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2020Q1/devel/nspr: . files X-SVN-Commit-Revision: 528114 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 18:25:09 -0000 Author: jbeich Date: Mon Mar 9 18:25:06 2020 New Revision: 528114 URL: https://svnweb.freebsd.org/changeset/ports/528114 Log: MFH: r524792 devel/nspr: update to 4.25 - Only run tests enabled on upstream CI Changes: http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-25-Release-td383750.html ABI: https://abi-laboratory.pro/tracker/timeline/nspr/ Reported by: Repology Approved by: ports-secteam blanket Modified: branches/2020Q1/devel/nspr/Makefile branches/2020Q1/devel/nspr/distinfo branches/2020Q1/devel/nspr/files/patch-tests Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/nspr/Makefile ============================================================================== --- branches/2020Q1/devel/nspr/Makefile Mon Mar 9 18:23:59 2020 (r528113) +++ branches/2020Q1/devel/nspr/Makefile Mon Mar 9 18:25:06 2020 (r528114) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nspr -DISTVERSION= 4.24 +DISTVERSION= 4.25 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src @@ -39,7 +39,7 @@ post-install: do-test-TEST-on: ${TEST_WRKSRC}/lib/tests/string ${TEST_WRKSRC}/lib/tests/base64t - cd ${TEST_WRKSRC}/pr/tests && ${WRKSRC}/pr/tests/runtests.sh + (cd ${TEST_WRKSRC}/pr/tests && ${WRKSRC}/pr/tests/runtests.sh ${TEST_WRKSRC}/dist) # The test below is commented out, because arena requires # command-line arguments. If you can provide reasonable values # for it, please contact ${MAINTAINER}. Thank you. Modified: branches/2020Q1/devel/nspr/distinfo ============================================================================== --- branches/2020Q1/devel/nspr/distinfo Mon Mar 9 18:23:59 2020 (r528113) +++ branches/2020Q1/devel/nspr/distinfo Mon Mar 9 18:25:06 2020 (r528114) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575309517 -SHA256 (nspr-4.24.tar.gz) = 90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0 -SIZE (nspr-4.24.tar.gz) = 1078825 +TIMESTAMP = 1580503070 +SHA256 (nspr-4.25.tar.gz) = 0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256 +SIZE (nspr-4.25.tar.gz) = 1079633 Modified: branches/2020Q1/devel/nspr/files/patch-tests ============================================================================== --- branches/2020Q1/devel/nspr/files/patch-tests Mon Mar 9 18:23:59 2020 (r528113) +++ branches/2020Q1/devel/nspr/files/patch-tests Mon Mar 9 18:25:06 2020 (r528114) @@ -9,38 +9,6 @@ endif endif endif ---- pr/tests/Makefile.in.orig 2019-10-15 14:21:38 UTC -+++ pr/tests/Makefile.in -@@ -442,17 +442,18 @@ endif - ALWAYS: - - runtests:: $(PROGS) ALWAYS -- @$(ECHO) "\nNSPR Test Results - $(OBJDIR)\n" -- @$(ECHO) "BEGIN\t\t\t`date`" -- @$(ECHO) "NSPR_TEST_LOGFILE\t$(LOGFILE)\n" -- @$(ECHO) "Test\t\t\tResult\n" -+ @$(ECHO) "NSPR Test Results - $(OBJDIR)" -+ @$(ECHO) "BEGIN `date`" -+ @$(ECHO) "Test Result" - @cd $(OBJDIR); for i in $(PROGRAMS); do \ -- $(ECHO) "$$i\c"; \ -- ./$$i >> $(LOGFILE) 2>&1 ; \ -+ printf "$$i"; \ -+ ./$$i > $$i.output 2>&1; \ - if [ 0 = $$? ] ; then \ -- $(ECHO) "\t\t\tPassed"; \ -- else \ -- $(ECHO) "\t\t\tFAILED"; \ -- fi; \ -+ $(ECHO) " Passed"; \ -+ rm $$i.output; \ -+ else \ -+ $(ECHO) " FAILED"; \ -+ cat $$i.output; \ -+ fi; \ - done -- @$(ECHO) "\nEND\t\t`date`\n" -+ @$(ECHO) "END `date`" --- pr/tests/cleanup.c.orig 2019-10-15 14:21:38 UTC +++ pr/tests/cleanup.c @@ -15,7 +15,7 @@ @@ -1042,51 +1010,9 @@ programName, writesMin, writesTot * 1000 / durationTot, writesMax); PR_DestroyCondVar(cv); ---- pr/tests/runtests.sh.orig 2019-08-19 14:12:12 UTC -+++ pr/tests/runtests.sh -@@ -56,9 +56,6 @@ fi - # Tests not run (but should) - # - --#forktest (failed on IRIX) --#nbconn - fails on some platforms --#poll_er - fails on some platforms? limited use? - #prpoll - the bad-FD test needs to be moved to a different test - #sleep - specific to OS/2 - -@@ -91,6 +88,7 @@ exit - fdcach - fileio - foreign -+forktest - formattm - fsync - gethost -@@ -98,7 +96,6 @@ getproto - i2l - initclk - inrval --instrumt - intrio - intrupt - io_timeout -@@ -119,6 +116,7 @@ logger - many_cv - multiwait - nameshm1 -+nbconn - nblayer - nonblock - ntioto -@@ -135,6 +133,7 @@ perf - pipeping - pipeping2 - pipeself -+poll_er - poll_nm - poll_to - pollable -@@ -207,7 +206,7 @@ OBJDIR=`basename $PWD` +--- pr/tests/runtests.sh.orig 2020-01-31 20:37:50.000000000 +0000 ++++ pr/tests/runtests.sh 2020-02-01 22:39:16.320853988 +0000 +@@ -226,7 +226,7 @@ OBJDIR=`basename $PWD` printf "\nNSPR Test Results - $OBJDIR\n\n" printf "BEGIN\t\t\t`date`\n" printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n" @@ -1095,11 +1021,11 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then for prog in $TESTS do -@@ -225,10 +224,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = +@@ -244,10 +244,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = else for prog in $TESTS do -- printf "$prog" +- printf "$prog (`date +%T`)" - printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1 - export test_rval - ./$prog >> ${LOGFILE} 2>&1 & @@ -1108,7 +1034,7 @@ test_pid=$! sleep_pid=0 if test -n "$TEST_TIMEOUT" && test "$TEST_TIMEOUT" -gt 0 -@@ -243,28 +240,11 @@ else +@@ -262,9 +260,9 @@ else printf "\t\t\tPassed\n"; else printf "\t\t\tFAILED\n"; @@ -1119,28 +1045,9 @@ done fi; - printf "END\t\t\t`date`\n" - exit $rval -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ---- pr/tests/sel_spd.c.orig 2019-10-15 14:21:38 UTC +--- pr/tests/sel_spd.c.orig 2020-01-31 20:37:50 UTC +++ pr/tests/sel_spd.c -@@ -15,23 +15,26 @@ +@@ -15,6 +15,9 @@ #include #include #include @@ -1148,7 +1055,10 @@ +# include /* getopt(3) */ +#endif - #define PORT_BASE 19000 + #ifdef DEBUG + #define PORT_INC_DO +100 +@@ -30,19 +33,19 @@ + #define PORT_BASE 19000 PORT_INC_DO PORT_INC_3264 typedef struct timer_slot_t { - unsigned long d_connect; @@ -1177,16 +1087,16 @@ static int verbose=0; static PRMonitor *exit_cv; -@@ -88,7 +91,7 @@ _server_thread(void *arg_id) +@@ -98,7 +101,7 @@ _server_thread(void *arg_id) + { void _client_thread(void *); - PRThread *thread; int *id = (int *)arg_id; - PRFileDesc *sock; + PRFileDesc *sock = NULL; PRSocketOptionData sockopt; PRNetAddr sa; PRFileDesc * newsock; -@@ -467,12 +470,12 @@ void +@@ -476,12 +479,12 @@ void tally_results(int verbose) { int index;