svn commit: r402128 - in head: Mk devel/nspr devel/nspr/files
Jan Beich
jbeich at FreeBSD.org
Sat Nov 21 02:26:18 UTC 2015
Author: jbeich
Date: Sat Nov 21 02:26:15 2015
New Revision: 402128
URL: https://svnweb.freebsd.org/changeset/ports/402128
Log:
devel/nspr: cleanup cruft to improve style
- Remove out-of-tree build (in favor of D4157)
- Remove custom do-install (config/nsinstall works fine) [1]
- Convert to new testing framework
- Refresh patches with |make makepatch| but leave damage out [2]
[1] Requires PORTREVISION per new entry in plist and DEBUG builds
no longer embedding WRKDIR in source file name
[2] Here's a list with * indicating severity:
*** Lost original ptthread.c hunk from patch-bug301986
*** Mixed patch-bug782111 into patch-bug301986
** Duplicated context lines
* Wrong timestamps with USES=pathfix
Added:
head/devel/nspr/files/patch-config_nspr.pc.in (contents, props changed)
- copied, changed from r402127, head/devel/nspr/files/patch-config-nsprc.pc.in
head/devel/nspr/files/patch-configure (contents, props changed)
- copied, changed from r402127, head/devel/nspr/files/patch-..::configure
Deleted:
head/devel/nspr/files/patch-..::config::autoconf.mk.in
head/devel/nspr/files/patch-..::configure
head/devel/nspr/files/patch-config-nsprc.pc.in
Modified:
head/Mk/bsd.gecko.mk (contents, props changed)
head/devel/nspr/Makefile (contents, props changed)
head/devel/nspr/files/patch-bug301986 (contents, props changed)
head/devel/nspr/files/patch-bug782109 (contents, props changed)
head/devel/nspr/files/patch-bug782111 (contents, props changed)
head/devel/nspr/files/patch-libtests (contents, props changed)
head/devel/nspr/files/patch-tests (contents, props changed)
head/devel/nspr/files/patch-warnings (contents, props changed)
head/devel/nspr/pkg-plist (contents, props changed)
Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk Sat Nov 21 02:24:52 2015 (r402127)
+++ head/Mk/bsd.gecko.mk Sat Nov 21 02:26:15 2015 (r402128)
@@ -533,7 +533,7 @@ gecko-post-patch:
.if ${USE_MOZILLA:M-nspr}
@${ECHO_MSG} "===> Applying NSPR patches"
@for i in ${.CURDIR}/../../devel/nspr/files/patch-*; do \
- ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub/build < $$i; \
+ ${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/nsprpub < $$i; \
done
.endif
.if ${USE_MOZILLA:M-nss}
Modified: head/devel/nspr/Makefile
==============================================================================
--- head/devel/nspr/Makefile Sat Nov 21 02:24:52 2015 (r402127)
+++ head/devel/nspr/Makefile Sat Nov 21 02:26:15 2015 (r402128)
@@ -3,78 +3,49 @@
PORTNAME= nspr
DISTVERSION= 4.10.10
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
MAINTAINER= gecko at FreeBSD.org
COMMENT= Platform-neutral API for system level and libc like functions
-WRKSRC= ${WRKDIR}/${DISTNAME}/nspr/build
-
-USES= cpe gmake
+USES= cpe gmake pathfix
CPE_VENDOR= mozilla
CPE_PRODUCT= netscape_portable_runtime
-USE_LDCONFIG= yes
+WRKSRC_SUBDIR= nspr
GNU_CONFIGURE= yes
-CONFIGURE_SCRIPT=../configure
-CONFIGURE_ARGS= --srcdir=${WRKSRC:H}
-
-MAKE_ENV= DIST=${WRKSRC}/dist
-
-LIBRARIES= libnspr4.so.1 libplc4.so.1 libplds4.so.1
+USE_LDCONFIG= yes
-OPTIONS_DEFINE= DEBUG
+OPTIONS_DEFINE= DEBUG TEST
DEBUG_CONFIGURE_ENABLE=debug
-do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/include/nspr
- ${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \
- ${TAR} -C ${STAGEDIR}${PREFIX}/include -xof -
- ${FIND} ${STAGEDIR}${PREFIX}/include/nspr -type d | \
- ${XARGS} ${CHMOD} 0755
- ${FIND} ${STAGEDIR}${PREFIX}/include/nspr -type f | \
- ${XARGS} ${CHMOD} ${SHAREMODE}
- ${TAR} -C ${WRKSRC}/dist/lib --dereference -cf - . | \
- ${TAR} -C ${STAGEDIR}${PREFIX}/lib -xof -
- ${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${STAGEDIR}${PREFIX}/bin
- ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
- ${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
-.for lib in ${LIBRARIES}
-.if defined(STRIP) && ${STRIP} != ""
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
-.endif
- ${CHMOD} ${LIBMODE} ${STAGEDIR}${PREFIX}/lib/${lib}
- ${LN} -sf ${lib} ${STAGEDIR}${PREFIX}/lib/${lib:R}
-.endfor
-
-prtests:
- ${DO_MAKE_BUILD} -C ${WRKSRC}/pr/tests
- ${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so
- cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh
-
-libtests:
- ${DO_MAKE_BUILD} -C ${WRKSRC}/lib/tests
- ${WRKSRC}/lib/tests/string
- ${WRKSRC}/lib/tests/base64t
+post-patch:
+# Do not install tools to build itself
+ @${REINPLACE_CMD} -e '/RELEASE_BINS/d' \
+ ${WRKSRC}/pr/src/misc/Makefile.in
+
+post-build-TEST-on:
+ @${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/lib/tests
+ @${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/pr/tests
+ @${LN} -fs libmy.so.1 ${BUILD_WRKSRC}/pr/tests/dll/libmy.so
+
+post-install:
+ @for file in ${STAGEDIR}${PREFIX}/lib/*.so*; do \
+ ${STRIP_CMD} $$file; \
+ ${CHMOD} ${LIBMODE} $$file; \
+ ${LN} -fs $${file##*/} $${file%.*}; \
+ done
+
+do-test-TEST-on:
+ ${TEST_WRKSRC}/lib/tests/string
+ ${TEST_WRKSRC}/lib/tests/base64t
+ cd ${TEST_WRKSRC}/pr/tests && ${WRKSRC}/pr/tests/runtests.sh
# 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.
- # ${WRKSRC}/lib/tests/arena
- #
-
-test: libtests prtests
-
-#regression-test: test
-
-#.if defined(PACKAGE_BUILDING)
-#post-build: test
-#.else
-post-build:
- #
- # Please, consider running ``make test'' to find any
- # possible build problems.
+ # ${TEST_WRKSRC}/lib/tests/arena
#
-#.endif
.include <bsd.port.mk>
Modified: head/devel/nspr/files/patch-bug301986
==============================================================================
--- head/devel/nspr/files/patch-bug301986 Sat Nov 21 02:24:52 2015 (r402127)
+++ head/devel/nspr/files/patch-bug301986 Sat Nov 21 02:26:15 2015 (r402128)
@@ -3,24 +3,29 @@ Better to just keep calling it pthread_t
-mi
---- ../pr/include/private/pprthred.h Sun Apr 25 11:00:56 2004
-+++ ../pr/include/private/pprthred.h Tue Jul 12 00:52:42 2005
-@@ -44,4 +44,5 @@
+--- pr/include/private/pprthred.h.orig 2015-10-16 13:22:19 UTC
++++ pr/include/private/pprthred.h
+@@ -11,6 +11,7 @@
+ ** developers only.
*/
#include "nspr.h"
+#include <pthread.h>
#if defined(XP_OS2)
-@@ -92,5 +92,5 @@
+ #define INCL_DOS
+@@ -59,7 +60,7 @@ NSPR_API(void) PR_DetachThread(void);
+ ** Get the id of the named thread. Each thread is assigned a unique id
** when it is created or attached.
*/
-NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
+NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
/*
---- ../pr/src/pthreads/ptthread.c Wed May 25 22:27:51 2005
-+++ ../pr/src/pthreads/ptthread.c Tue Jul 12 00:49:50 2005
-@@ -979,10 +979,10 @@
+ ** Set the procedure that is called when a thread is dumped. The procedure
+--- pr/src/pthreads/ptthread.c.orig 2015-10-16 13:22:19 UTC
++++ pr/src/pthreads/ptthread.c
+@@ -1155,12 +1155,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
+ _exit(status);
}
-PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
@@ -33,3 +38,4 @@ Better to just keep calling it pthread_t
+ return thred->id; /* and I don't know what they will do with it */
#endif
}
+
Modified: head/devel/nspr/files/patch-bug782109
==============================================================================
--- head/devel/nspr/files/patch-bug782109 Sat Nov 21 02:24:52 2015 (r402127)
+++ head/devel/nspr/files/patch-bug782109 Sat Nov 21 02:26:15 2015 (r402128)
@@ -1,6 +1,6 @@
---- ../pr/include/md/_freebsd.h~
-+++ ../pr/include/md/_freebsd.h
-@@ -47,6 +47,14 @@
+--- pr/include/md/_freebsd.h.orig 2015-10-16 13:22:19 UTC
++++ pr/include/md/_freebsd.h
+@@ -57,6 +57,14 @@
#define _PR_HAVE_LARGE_OFF_T
#if defined(_PR_PTHREADS)
@@ -15,8 +15,8 @@
#if __FreeBSD_version >= 400008
/*
* libc_r before this version of FreeBSD doesn't have poll().
---- ../pr/src/misc/prnetdb.c
-+++ ../pr/src/misc/prnetdb.c
+--- pr/src/misc/prnetdb.c.orig 2015-10-16 13:22:19 UTC
++++ pr/src/misc/prnetdb.c
@@ -78,11 +78,6 @@ PRLock *_pr_dnsLock = NULL;
#define _PR_HAVE_GETPROTO_R_INT
#endif
Modified: head/devel/nspr/files/patch-bug782111
==============================================================================
--- head/devel/nspr/files/patch-bug782111 Sat Nov 21 02:24:52 2015 (r402127)
+++ head/devel/nspr/files/patch-bug782111 Sat Nov 21 02:26:15 2015 (r402128)
@@ -1,5 +1,5 @@
---- ../pr/src/pthreads/ptthread.c
-+++ ../pr/src/pthreads/ptthread.c
+--- pr/src/pthreads/ptthread.c.orig 2015-11-20 22:19:14 UTC
++++ pr/src/pthreads/ptthread.c
@@ -21,6 +21,10 @@
#include <signal.h>
#include <dlfcn.h>
@@ -11,7 +11,7 @@
#ifdef SYMBIAN
/* In Open C sched_get_priority_min/max do not work properly, so we undefine
* _POSIX_THREAD_PRIORITY_SCHEDULING here.
-@@ -1619,7 +1623,7 @@ PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name)
+@@ -1733,7 +1737,7 @@ PR_IMPLEMENT(PRStatus) PR_SetCurrentThre
{
PRThread *thread;
size_t nameLen;
@@ -20,7 +20,7 @@
if (!name) {
PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
-@@ -1637,8 +1641,10 @@ PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name)
+@@ -1751,8 +1755,10 @@ PR_IMPLEMENT(PRStatus) PR_SetCurrentThre
return PR_FAILURE;
memcpy(thread->name, name, nameLen + 1);
Copied and modified: head/devel/nspr/files/patch-config_nspr.pc.in (from r402127, head/devel/nspr/files/patch-config-nsprc.pc.in)
==============================================================================
--- head/devel/nspr/files/patch-config-nsprc.pc.in Sat Nov 21 02:24:52 2015 (r402127, copy source)
+++ head/devel/nspr/files/patch-config_nspr.pc.in Sat Nov 21 02:26:15 2015 (r402128)
@@ -1,6 +1,6 @@
---- ../config/nspr.pc.in.orig 2012-05-19 00:26:17.000000000 +0200
-+++ ../config/nspr.pc.in 2012-06-05 16:19:31.000000000 +0200
-@@ -6,5 +6,5 @@
+--- config/nspr.pc.in.orig 2015-10-16 13:22:19 UTC
++++ config/nspr.pc.in
+@@ -6,5 +6,5 @@ includedir=@includedir@
Name: NSPR
Description: The Netscape Portable Runtime
Version: @MOD_MAJOR_VERSION at .@MOD_MINOR_VERSION at .@MOD_PATCH_VERSION@
Copied and modified: head/devel/nspr/files/patch-configure (from r402127, head/devel/nspr/files/patch-..::configure)
==============================================================================
--- head/devel/nspr/files/patch-..::configure Sat Nov 21 02:24:52 2015 (r402127, copy source)
+++ head/devel/nspr/files/patch-configure Sat Nov 21 02:26:15 2015 (r402128)
@@ -1,7 +1,7 @@
---- ../configure.orig 2012-02-14 20:06:00.000000000 +0100
-+++ ../configure 2012-02-17 17:14:27.862323726 +0100
-@@ -4035,11 +4035,8 @@ EOF
- EOF
+--- configure.orig 2015-10-16 13:22:19 UTC
++++ configure
+@@ -6674,11 +6674,8 @@ tools are selected during the Xcode/Deve
+ $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h
CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
- MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
@@ -14,9 +14,7 @@
fi
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC
-@@ -6271,11 +6271,9 @@
- #define _THREAD_SAFE 1
- EOF
+@@ -8332,8 +8329,6 @@ $as_echo "$ac_cv_have_dash_pthreads" >&6
if test "$ac_cv_have_dash_pthread" = "yes"; then
_PTHREAD_LDFLAGS="-pthread"
@@ -25,5 +23,3 @@
fi
;;
*-netbsd*)
- if test "$ac_cv_have_dash_pthread" = "yes"; then
-
Modified: head/devel/nspr/files/patch-libtests
==============================================================================
--- head/devel/nspr/files/patch-libtests Sat Nov 21 02:24:52 2015 (r402127)
+++ head/devel/nspr/files/patch-libtests Sat Nov 21 02:26:15 2015 (r402128)
@@ -1,13 +1,63 @@
---- ../lib/tests/string.c Sun Apr 25 11:00:46 2004
-+++ ../lib/tests/string.c Mon Jul 25 20:14:12 2005
-@@ -160,5 +160,5 @@
+--- lib/tests/arena.c.orig 2015-10-16 13:22:19 UTC
++++ lib/tests/arena.c
+@@ -36,6 +36,7 @@ void DumpAll( void )
+ return;
+ }
+
++#if 0
+ /*
+ ** Test Arena allocation.
+ */
+@@ -96,6 +97,7 @@ static void ArenaGrow( void )
+
+ return;
+ } /* end ArenaGrow() */
++#endif
+
+
+ /*
+--- lib/tests/base64t.c.orig 2015-10-16 13:22:19 UTC
++++ lib/tests/base64t.c
+@@ -1987,7 +1987,6 @@ PRBool test_008(void)
+ for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
+ {
+ PRUint32 plen = PL_strlen(array[i].plaintext);
+- PRUint32 clen = ((plen + 2)/3)*4;
+
+ char *rv = PL_Base64Encode(array[i].plaintext, plen, (char *)0);
+
+@@ -2747,9 +2746,6 @@ PRBool test_024(void)
+
+ for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
+ {
+- PRUint32 plen = PL_strlen(array[i].plaintext);
+- PRUint32 clen = ((plen + 2)/3)*4;
+-
+ char *rv = PL_Base64Encode(array[i].plaintext, 0, (char *)0);
+
+ if( (char *)0 == rv )
+@@ -2883,8 +2879,6 @@ PRBool test_027(void)
+
+ for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
+ {
+- PRUint32 clen = PL_strlen(array[i].cyphertext);
+-
+ char *rv = PL_Base64Decode(array[i].cyphertext, 0, (char *)0);
+
+ if( (char *)0 == rv )
+--- lib/tests/string.c.orig 2015-10-16 13:22:19 UTC
++++ lib/tests/string.c
+@@ -127,7 +127,7 @@ PRBool test_003(void)
+ rv = PL_strcpy(array[i].dest, array[i].str);
if( array[i].rv != rv )
{
- printf("FAIL %d: (0x%x, %s)->0x%x\n", i, array[i].dest,
+ printf("FAIL %d: (%p, %s)->%p\n", i, array[i].dest,
array[i].str ? array[i].str : "(null)", rv);
return PR_FALSE;
-@@ -270,6 +270,6 @@
+ }
+@@ -237,8 +237,8 @@ PRBool test_004(void)
+ rv = PL_strncpy(array[i].dest, array[i].str, array[i].len);
if( array[i].rv != rv )
{
- printf("FAIL %d: (0x%x, %s, %lu)->0x%x\n", i, array[i].dest,
@@ -16,7 +66,9 @@
+ array[i].str ? array[i].str : "(null)", (unsigned)array[i].len, rv);
return PR_FALSE;
}
-@@ -396,6 +396,6 @@
+
+@@ -363,8 +363,8 @@ PRBool test_005(void)
+ rv = PL_strncpyz(array[i].dest, array[i].str, array[i].len);
if( array[i].rv != rv )
{
- printf("FAIL %d: (0x%x, %s, %lu)->0x%x\n", i, array[i].dest,
@@ -25,14 +77,18 @@
+ array[i].str ? array[i].str : "(null)", (unsigned)array[i].len, rv);
return PR_FALSE;
}
-@@ -448,5 +448,5 @@
+
+@@ -415,7 +415,7 @@ PRBool test_006(void)
+
if( (char *)0 == rv )
{
- printf("FAIL %d: 0x%x -> 0\n", i, array[i]);
+ printf("FAIL %d: %p -> 0\n", i, array[i]);
return PR_FALSE;
}
-@@ -532,6 +532,6 @@
+
+@@ -499,8 +499,8 @@ PRBool test_007(void)
+
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%lu -> 0\n", i,
@@ -41,7 +97,9 @@
+ array[i].str ? array[i].str : "(null)", (unsigned)array[i].len);
return PR_FALSE;
}
-@@ -717,8 +717,8 @@
+
+@@ -684,10 +684,10 @@ PRBool test_009(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s+%s/%lu -> %.32s, not zero\n", i,
@@ -52,7 +110,9 @@
+ (unsigned)array[i].length, rv);
return PR_FALSE;
}
-@@ -728,8 +728,8 @@
+ }
+@@ -695,10 +695,10 @@ PRBool test_009(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s+%s/%lu -> null, not %s\n", i,
@@ -63,7 +123,9 @@
+ (unsigned)array[i].length, array[i].result);
return PR_FALSE;
}
-@@ -743,8 +743,8 @@
+ else
+@@ -710,10 +710,10 @@ PRBool test_009(void)
+ {
if( *a != *b )
{
- printf("FAIL %d: %s+%s/%lu -> %.32s, not %s\n", i,
@@ -74,7 +136,9 @@
+ (unsigned)array[i].length, rv, array[i].result);
return PR_FALSE;
}
-@@ -758,8 +758,8 @@
+
+@@ -725,10 +725,10 @@ PRBool test_009(void)
+ {
if( (char)0 != *b )
{
- printf("FAIL %d: %s+%s/%lu -> not nulled\n", i,
@@ -85,7 +149,9 @@
+ (unsigned)array[i].length);
return PR_FALSE;
}
-@@ -769,8 +769,8 @@
+ }
+@@ -736,10 +736,10 @@ PRBool test_009(void)
+ {
if( (char)0 == *b )
{
- printf("FAIL %d: %s+%s/%lu -> overrun\n", i,
@@ -96,7 +162,9 @@
+ (unsigned)array[i].length);
return PR_FALSE;
}
-@@ -847,8 +847,8 @@
+ }
+@@ -814,10 +814,10 @@ PRBool test_010(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s+%s/%lu -> %.32s, not zero\n", i,
@@ -107,7 +175,9 @@
+ (unsigned)array[i].length, rv);
return PR_FALSE;
}
-@@ -858,8 +858,8 @@
+ }
+@@ -825,10 +825,10 @@ PRBool test_010(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s+%s/%lu -> null, not %s\n", i,
@@ -118,7 +188,9 @@
+ (unsigned)array[i].length, array[i].result);
return PR_FALSE;
}
-@@ -873,8 +873,8 @@
+ else
+@@ -840,10 +840,10 @@ PRBool test_010(void)
+ {
if( *a != *b )
{
- printf("FAIL %d: %s+%s/%lu -> %.32s, not %s\n", i,
@@ -129,7 +201,9 @@
+ (unsigned)array[i].length, rv, array[i].result);
return PR_FALSE;
}
-@@ -1105,8 +1105,8 @@
+
+@@ -1072,10 +1072,10 @@ PRBool test_012(void)
+ break;
}
- printf("FAIL %d: %s-%s/%ld -> %d, not %d\n", i,
@@ -140,7 +214,9 @@
+ (int)array[i].max, rv, array[i].sign);
return PR_FALSE;
}
-@@ -1327,8 +1327,8 @@
+
+@@ -1294,10 +1294,10 @@ PRBool test_014(void)
+ break;
}
- printf("FAIL %d: %s-%s/%ld -> %d, not %d\n", i,
@@ -151,7 +227,9 @@
+ (int)array[i].max, rv, array[i].sign);
return PR_FALSE;
}
-@@ -1400,6 +1400,6 @@
+
+@@ -1367,15 +1367,15 @@ PRBool test_015(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%c -> null, not +%lu\n", i, array[i].str,
@@ -160,7 +238,7 @@
+ array[i].chr, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1407,6 +1407,6 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%c -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
@@ -169,7 +247,9 @@
+ array[i].chr, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1480,6 +1480,6 @@
+ }
+@@ -1447,15 +1447,15 @@ PRBool test_016(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%c -> null, not +%lu\n", i, array[i].str,
@@ -178,7 +258,7 @@
+ array[i].chr, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1487,6 +1487,6 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%c -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
@@ -187,7 +267,9 @@
+ array[i].chr, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1555,6 +1555,6 @@
+ }
+@@ -1522,8 +1522,8 @@ PRBool test_017(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%c/%lu -> %.32s, not zero\n", i, array[i].str,
@@ -196,7 +278,9 @@
+ array[i].chr, (unsigned)array[i].max, rv);
return PR_FALSE;
}
-@@ -1564,6 +1564,6 @@
+ }
+@@ -1531,15 +1531,15 @@ PRBool test_017(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%c/%lu -> null, not +%lu\n", i, array[i].str,
@@ -205,7 +289,7 @@
+ array[i].chr, (unsigned)array[i].max, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1571,6 +1571,6 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%c/%lu -> 0x%x, not 0x%x+%lu\n", i, array[i].str,
@@ -214,7 +298,9 @@
+ array[i].chr, (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1639,6 +1639,6 @@
+ }
+@@ -1606,8 +1606,8 @@ PRBool test_018(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%c/%lu -> %.32s, not zero\n", i, array[i].str,
@@ -223,7 +309,9 @@
+ array[i].chr, (unsigned)array[i].max, rv);
return PR_FALSE;
}
-@@ -1648,13 +1648,13 @@
+ }
+@@ -1615,15 +1615,15 @@ PRBool test_018(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%c/%lu -> null, not +%lu\n", i, array[i].str,
@@ -242,7 +330,9 @@
+ array[i].chr, (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1735,8 +1735,8 @@
+ }
+@@ -1702,19 +1702,19 @@ PRBool test_019(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not +%lu\n", i,
@@ -253,7 +343,7 @@
+ (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1744,8 +1744,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
@@ -264,7 +354,9 @@
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1826,8 +1826,8 @@
+ }
+@@ -1793,19 +1793,19 @@ PRBool test_020(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not +%lu\n", i,
@@ -275,7 +367,7 @@
+ (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1835,8 +1835,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
@@ -286,7 +378,9 @@
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -1912,8 +1912,8 @@
+ }
+@@ -1879,10 +1879,10 @@ PRBool test_021(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
@@ -297,7 +391,9 @@
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
-@@ -1923,8 +1923,8 @@
+ }
+@@ -1890,19 +1890,19 @@ PRBool test_021(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not +%lu\n", i,
@@ -308,7 +404,7 @@
+ (unsigned)array[i].max, array[i].off);
return PR_FALSE;
}
-@@ -1932,8 +1932,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
@@ -319,7 +415,9 @@
+ (unsigned)array[i].max, rv, array[i].str, array[i].off);
return PR_FALSE;
}
-@@ -2018,8 +2018,8 @@
+ }
+@@ -1985,10 +1985,10 @@ PRBool test_022(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
@@ -330,7 +428,9 @@
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
-@@ -2029,8 +2029,8 @@
+ }
+@@ -1996,19 +1996,19 @@ PRBool test_022(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not +%lu\n", i,
@@ -341,7 +441,7 @@
+ (unsigned)array[i].max, array[i].off);
return PR_FALSE;
}
-@@ -2038,8 +2038,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
@@ -352,7 +452,9 @@
+ (unsigned)array[i].max, rv, array[i].str, array[i].off);
return PR_FALSE;
}
-@@ -2137,8 +2137,8 @@
+ }
+@@ -2104,19 +2104,19 @@ PRBool test_023(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
@@ -363,7 +465,7 @@
+ array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2146,8 +2146,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
@@ -374,7 +476,9 @@
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2245,8 +2245,8 @@
+ }
+@@ -2212,19 +2212,19 @@ PRBool test_024(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
@@ -385,7 +489,7 @@
+ array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2254,8 +2254,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
@@ -396,7 +500,9 @@
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2364,8 +2364,8 @@
+ }
+@@ -2331,10 +2331,10 @@ PRBool test_025(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
@@ -407,7 +513,9 @@
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
-@@ -2375,8 +2375,8 @@
+ }
+@@ -2342,19 +2342,19 @@ PRBool test_025(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
@@ -418,7 +526,7 @@
+ (unsigned)array[i].max, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2384,8 +2384,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
@@ -429,7 +537,9 @@
+ (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2496,8 +2496,8 @@
+ }
+@@ -2463,10 +2463,10 @@ PRBool test_026(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
@@ -440,7 +550,9 @@
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
-@@ -2507,8 +2507,8 @@
+ }
+@@ -2474,19 +2474,19 @@ PRBool test_026(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
@@ -451,7 +563,7 @@
+ (unsigned)array[i].max, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2516,8 +2516,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
@@ -462,7 +574,9 @@
+ (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2615,8 +2615,8 @@
+ }
+@@ -2582,19 +2582,19 @@ PRBool test_027(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
@@ -473,7 +587,7 @@
+ array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2624,8 +2624,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
@@ -484,7 +598,9 @@
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2723,8 +2723,8 @@
+ }
+@@ -2690,19 +2690,19 @@ PRBool test_028(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s -> null, not 0x%x+%lu\n", i,
@@ -495,7 +611,7 @@
+ array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2732,8 +2732,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
@@ -506,7 +622,9 @@
+ rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2842,8 +2842,8 @@
+ }
+@@ -2809,10 +2809,10 @@ PRBool test_029(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
@@ -517,7 +635,9 @@
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
-@@ -2853,8 +2853,8 @@
+ }
+@@ -2820,19 +2820,19 @@ PRBool test_029(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
@@ -528,7 +648,7 @@
+ (unsigned)array[i].max, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2862,8 +2862,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
@@ -539,7 +659,9 @@
+ (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2974,8 +2974,8 @@
+ }
+@@ -2941,10 +2941,10 @@ PRBool test_030(void)
+ {
if( (char *)0 != rv )
{
- printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
@@ -550,7 +672,9 @@
+ (unsigned)array[i].max, rv);
return PR_FALSE;
}
-@@ -2985,8 +2985,8 @@
+ }
+@@ -2952,19 +2952,19 @@ PRBool test_030(void)
+ {
if( (char *)0 == rv )
{
- printf("FAIL %d: %s,%s/%lu -> null, not 0x%x+%lu\n", i,
@@ -561,7 +685,7 @@
+ (unsigned)array[i].max, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
-@@ -2994,8 +2994,8 @@
+
if( &array[i].str[ array[i].off ] != rv )
{
- printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
@@ -572,40 +696,4 @@
+ (unsigned)array[i].max, rv, array[i].str, (unsigned)array[i].off);
return PR_FALSE;
}
---- ../lib/tests/arena.c Sun Apr 25 11:00:46 2004
-+++ ../lib/tests/arena.c Mon Jul 25 19:52:15 2005
-@@ -69,4 +69,5 @@
- }
-
-+#if 0
- /*
- ** Test Arena allocation.
-@@ -129,4 +130,5 @@
- return;
- } /* end ArenaGrow() */
-+#endif
-
-
---- ../lib/tests/base64t.c Sun Apr 25 11:00:46 2004
-+++ ../lib/tests/base64t.c Mon Jul 25 20:16:54 2005
-@@ -2020,5 +2020,4 @@
- {
- PRUint32 plen = PL_strlen(array[i].plaintext);
-- PRUint32 clen = ((plen + 2)/3)*4;
-
- char *rv = PL_Base64Encode(array[i].plaintext, plen, (char *)0);
-@@ -2780,7 +2779,4 @@
- for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
- {
-- PRUint32 plen = PL_strlen(array[i].plaintext);
-- PRUint32 clen = ((plen + 2)/3)*4;
--
- char *rv = PL_Base64Encode(array[i].plaintext, 0, (char *)0);
-
-@@ -2916,6 +2912,4 @@
- for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
- {
-- PRUint32 clen = PL_strlen(array[i].cyphertext);
--
- char *rv = PL_Base64Decode(array[i].cyphertext, 0, (char *)0);
-
+ }
Modified: head/devel/nspr/files/patch-tests
==============================================================================
--- head/devel/nspr/files/patch-tests Sat Nov 21 02:24:52 2015 (r402127)
+++ head/devel/nspr/files/patch-tests Sat Nov 21 02:26:15 2015 (r402128)
@@ -1,13 +1,59 @@
---- ../pr/tests/cleanup.c Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/cleanup.c Tue Jul 12 01:19:53 2005
-@@ -48,5 +48,5 @@
+--- lib/tests/Makefile.in.orig 2015-10-16 13:22:19 UTC
++++ lib/tests/Makefile.in
+@@ -167,7 +167,7 @@ else
+ ifeq ($(OS_ARCH),OS2)
+ $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS)
+ else
+- $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(EXTRA_LIBS) -o $@
++ $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) -o $@
+ endif
+ endif
+ endif
+--- pr/tests/Makefile.in.orig 2015-10-16 13:22:19 UTC
++++ pr/tests/Makefile.in
+@@ -489,17 +489,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 2015-10-16 13:22:19 UTC
++++ pr/tests/cleanup.c
+@@ -15,7 +15,7 @@
+
static void PR_CALLBACK Thread(void *sleep)
{
- PR_Sleep(PR_SecondsToInterval((PRUint32)sleep));
+ PR_Sleep(PR_SecondsToInterval((intptr_t)sleep));
printf("Thread exiting\n");
}
-@@ -72,5 +72,6 @@
+
+@@ -39,7 +39,8 @@ int main(int argc, char **argv)
+ PRThreadScope type = PR_LOCAL_THREAD;
PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
PLOptState *opt = PL_CreateOptState(argc, argv, "Ghs:S:t:cC:");
- PRIntn concurrency = 1, child_sleep = 10, main_sleep = 5, threads = 1;
@@ -15,23 +61,38 @@
+ intptr_t child_sleep = 10;
PR_STDIO_INIT();
-@@ -113,5 +114,5 @@
+ while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
+@@ -80,7 +81,7 @@ int main(int argc, char **argv)
+ (PR_LOCAL_THREAD == type) ? "LOCAL" : "GLOBAL");
PR_fprintf(err, "\tConcurrency: %d\n", concurrency);
PR_fprintf(err, "\tNumber of threads: %d\n", threads);
- PR_fprintf(err, "\tThread sleep: %d\n", child_sleep);
+ PR_fprintf(err, "\tThread sleep: %d\n", (int)child_sleep);
PR_fprintf(err, "\tMain sleep: %d\n", main_sleep);
PR_fprintf(err, "\tCleanup will %sbe called\n\n", (cleanup) ? "" : "NOT ");
---- ../pr/tests/cvar.c Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/cvar.c Tue Jul 12 01:22:52 2005
-@@ -174,5 +174,5 @@
+
+--- pr/tests/cltsrv.c.orig 2015-10-16 13:22:19 UTC
++++ pr/tests/cltsrv.c
+@@ -887,7 +887,7 @@ int main(int argc, char** argv)
+ {
+ PRUintn index;
+ PRBool boolean;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list