Hello community,
here is the log from the commit of package mozilla-nspr for openSUSE:Factory
checked in at 2020-03-14 09:53:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozilla-nspr (Old)
and /work/SRC/openSUSE:Factory/.mozilla-nspr.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-nspr"
Sat Mar 14 09:53:58 2020 rev:74 rq:783554 version:4.25
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozilla-nspr/mozilla-nspr.changes
2020-01-11 14:37:55.653134640 +0100
+++ /work/SRC/openSUSE:Factory/.mozilla-nspr.new.3160/mozilla-nspr.changes
2020-03-14 09:53:59.099050440 +0100
@@ -1,0 +2,7 @@
+Tue Mar 3 21:11:34 UTC 2020 - Wolfgang Rosenauer <w...@rosenauer.org>
+
+- update to version 4.25
+ * fixed reading files larger than 4 GB on Win32
+ * added support for Xtensa architecture
+
+-------------------------------------------------------------------
Old:
----
nspr-4.24.tar.gz
New:
----
nspr-4.25.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-nspr.spec ++++++
--- /var/tmp/diff_new_pack.nImq0y/_old 2020-03-14 09:53:59.751050918 +0100
+++ /var/tmp/diff_new_pack.nImq0y/_new 2020-03-14 09:53:59.755050922 +0100
@@ -2,7 +2,7 @@
# spec file for package mozilla-nspr
#
# Copyright (c) 2020 SUSE LLC
-# 2006-2019 Wolfgang Rosenauer
+# 2006-2020 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: mozilla-nspr
-Version: 4.24
+Version: 4.25
Release: 0
Summary: Netscape Portable Runtime
License: MPL-2.0
++++++ nspr-4.24.tar.gz -> nspr-4.25.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/.hg_archival.txt
new/nspr-4.25/nspr/.hg_archival.txt
--- old/nspr-4.24/nspr/.hg_archival.txt 2019-12-02 18:58:37.000000000 +0100
+++ new/nspr-4.25/nspr/.hg_archival.txt 2020-01-31 21:37:50.000000000 +0100
@@ -1,4 +1,4 @@
repo: a4b34919bf34db2ee22acbbc305693c8980b6dc6
-node: 1209a835816dec6a52d11ea001e6f513c29d1642
-branch: NSPR_4_24_BRANCH
-tag: NSPR_4_24_RTM
+node: cf14b37a4afc971cbfc502e961ac9340574efd6f
+branch: default
+tag: NSPR_4_25_RTM
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/configure new/nspr-4.25/nspr/configure
--- old/nspr-4.24/nspr/configure 2019-12-02 18:58:37.000000000 +0100
+++ new/nspr-4.25/nspr/configure 2020-01-31 21:37:50.000000000 +0100
@@ -2486,7 +2486,7 @@
program_prefix=${target_alias}-
MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=24
+MOD_MINOR_VERSION=25
MOD_PATCH_VERSION=0
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/configure.in
new/nspr-4.25/nspr/configure.in
--- old/nspr-4.24/nspr/configure.in 2019-12-02 18:58:37.000000000 +0100
+++ new/nspr-4.25/nspr/configure.in 2020-01-31 21:37:50.000000000 +0100
@@ -15,7 +15,7 @@
dnl = Defaults
dnl ========================================================
MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=24
+MOD_MINOR_VERSION=25
MOD_PATCH_VERSION=0
NSPR_MODNAME=nspr20
_HAVE_PTHREADS=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/include/md/_linux.cfg
new/nspr-4.25/nspr/pr/include/md/_linux.cfg
--- old/nspr-4.24/nspr/pr/include/md/_linux.cfg 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/include/md/_linux.cfg 2020-01-31 21:37:50.000000000
+0100
@@ -1157,7 +1157,8 @@
#define PR_BYTES_PER_WORD_LOG2 2
#define PR_BYTES_PER_DWORD_LOG2 3
-#elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__)
+#elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__) || \
+ defined(__xtensa__)
#if defined(__microblaze__) && defined(__BIG_ENDIAN__)
#define IS_BIG_ENDIAN 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/include/md/_linux.h
new/nspr-4.25/nspr/pr/include/md/_linux.h
--- old/nspr-4.24/nspr/pr/include/md/_linux.h 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/include/md/_linux.h 2020-01-31 21:37:50.000000000
+0100
@@ -69,6 +69,8 @@
#define _PR_SI_ARCHITECTURE "microblaze"
#elif defined(__nds32__)
#define _PR_SI_ARCHITECTURE "nds32"
+#elif defined(__xtensa__)
+#define _PR_SI_ARCHITECTURE "xtensa"
#else
#error "Unknown CPU architecture"
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/include/prinit.h
new/nspr-4.25/nspr/pr/include/prinit.h
--- old/nspr-4.24/nspr/pr/include/prinit.h 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/include/prinit.h 2020-01-31 21:37:50.000000000
+0100
@@ -31,9 +31,9 @@
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
-#define PR_VERSION "4.24"
+#define PR_VERSION "4.25"
#define PR_VMAJOR 4
-#define PR_VMINOR 24
+#define PR_VMINOR 25
#define PR_VPATCH 0
#define PR_BETA PR_FALSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/src/md/windows/ntio.c
new/nspr-4.25/nspr/pr/src/md/windows/ntio.c
--- old/nspr-4.24/nspr/pr/src/md/windows/ntio.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/src/md/windows/ntio.c 2020-01-31 21:37:50.000000000
+0100
@@ -2252,6 +2252,7 @@
int rv, err;
LONG hiOffset = 0;
LONG loOffset;
+ LARGE_INTEGER offset; /* use for a normalized add of len to offset */
if (!fd->secret->md.sync_file_io) {
PRThread *me = _PR_MD_CURRENT_THREAD();
@@ -2368,7 +2369,14 @@
return -1;
}
- SetFilePointer((HANDLE)f, me->md.blocked_io_bytes, 0,
FILE_CURRENT);
+ /* Apply the workaround from bug 70765 (see _PR_MD_WRITE)
+ * to the reading code, too. */
+
+ offset.LowPart = me->md.overlapped.overlapped.Offset;
+ offset.HighPart = me->md.overlapped.overlapped.OffsetHigh;
+ offset.QuadPart += me->md.blocked_io_bytes;
+
+ SetFilePointer((HANDLE)f, offset.LowPart, &offset.HighPart,
FILE_BEGIN);
PR_ASSERT(me->io_pending == PR_FALSE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/Makefile.in
new/nspr-4.25/nspr/pr/tests/Makefile.in
--- old/nspr-4.24/nspr/pr/tests/Makefile.in 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/Makefile.in 2020-01-31 21:37:50.000000000
+0100
@@ -442,17 +442,4 @@
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"
- @cd $(OBJDIR); for i in $(PROGRAMS); do
\
- $(ECHO) "$$i\c";
\
- ./$$i >> $(LOGFILE) 2>&1 ;
\
- if [ 0 = $$? ] ; then
\
- $(ECHO) "\t\t\tPassed";
\
- else
\
- $(ECHO) "\t\t\tFAILED";
\
- fi;
\
- done
- @$(ECHO) "\nEND\t\t`date`\n"
+ $(topsrcdir)/pr/tests/runtests.sh $(DIST)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/acceptread.c
new/nspr-4.25/nspr/pr/tests/acceptread.c
--- old/nspr-4.24/nspr/pr/tests/acceptread.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/acceptread.c 2020-01-31 21:37:50.000000000
+0100
@@ -14,7 +14,18 @@
#include <stdlib.h>
-#define DEFAULT_PORT 12273
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define DEFAULT_PORT 12273 PORT_INC_DO PORT_INC_3264
#define GET "GET / HTTP/1.0\n\n"
static PRFileDesc *std_out, *err_out;
static PRIntervalTime write_dally, accept_timeout;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/acceptreademu.c
new/nspr-4.25/nspr/pr/tests/acceptreademu.c
--- old/nspr-4.24/nspr/pr/tests/acceptreademu.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/acceptreademu.c 2020-01-31 21:37:50.000000000
+0100
@@ -20,7 +20,18 @@
#include <stdlib.h>
-#define DEFAULT_PORT 12273
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define DEFAULT_PORT 12273 PORT_INC_DO PORT_INC_3264
#define GET "GET / HTTP/1.0\n\n"
static PRFileDesc *std_out, *err_out;
static PRIntervalTime write_dally, accept_timeout;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/append.c
new/nspr-4.25/nspr/pr/tests/append.c
--- old/nspr-4.24/nspr/pr/tests/append.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/append.c 2020-01-31 21:37:50.000000000
+0100
@@ -62,7 +62,7 @@
PL_DestroyOptState(opt);
} /* end block "Get command line options" */
/* ----------------------------------------------------------------------
*/
- fd = PR_Open( "/tmp/nsprAppend", (PR_APPEND | PR_CREATE_FILE | PR_TRUNCATE
| PR_WRONLY), 0666 );
+ fd = PR_Open( "./tmp-nsprAppend", (PR_APPEND | PR_CREATE_FILE |
PR_TRUNCATE | PR_WRONLY), 0666 );
if ( NULL == fd ) {
if (debug) {
printf("PR_Open() failed for writing: %d\n", PR_GetError());
@@ -98,7 +98,7 @@
goto Finished;
}
/* ----------------------------------------------------------------------
*/
- fd = PR_Open( "/tmp/nsprAppend", PR_RDONLY, 0 );
+ fd = PR_Open( "./tmp-nsprAppend", PR_RDONLY, 0 );
if ( NULL == fd ) {
if (debug) {
printf("PR_Open() failed for reading: %d\n", PR_GetError());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/cltsrv.c
new/nspr-4.25/nspr/pr/tests/cltsrv.c
--- old/nspr-4.24/nspr/pr/tests/cltsrv.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/cltsrv.c 2020-01-31 21:37:50.000000000
+0100
@@ -64,7 +64,20 @@
#define DEFAULT_HIGH 0
#define BUFFER_SIZE 1024
#define DEFAULT_BACKLOG 5
-#define DEFAULT_PORT 12849
+
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define DEFAULT_PORT 12849 PORT_INC_DO PORT_INC_3264
+
#define DEFAULT_CLIENTS 1
#define ALLOWED_IN_ACCEPT 1
#define DEFAULT_CLIPPING 1000
@@ -792,11 +805,16 @@
memset(&serverAddress, 0, sizeof(serverAddress));
if (PR_AF_INET6 != domain) {
+ TEST_LOG(cltsrv_log_file, TEST_LOG_ALWAYS,
+ ("server binding to ip port %s\n", DEFAULT_PORT));
rv = PR_InitializeNetAddr(PR_IpAddrAny, DEFAULT_PORT, &serverAddress);
}
- else
+ else {
+ TEST_LOG(cltsrv_log_file, TEST_LOG_ALWAYS,
+ ("server binding to ipv6 port %s\n", DEFAULT_PORT));
rv = PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, DEFAULT_PORT,
&serverAddress);
+ }
rv = PR_Bind(server->listener, &serverAddress);
TEST_ASSERT(PR_SUCCESS == rv);
@@ -1131,16 +1149,24 @@
client[index].ml = PR_NewLock();
if (serverIsLocal)
{
- if (PR_AF_INET6 != domain)
+ if (PR_AF_INET6 != domain) {
+ TEST_LOG(cltsrv_log_file, TEST_LOG_ALWAYS,
+ ("loopback client ip port %s\n", DEFAULT_PORT));
(void)PR_InitializeNetAddr(
PR_IpAddrLoopback, DEFAULT_PORT,
&client[index].serverAddress);
- else
+ }
+ else {
+ TEST_LOG(cltsrv_log_file, TEST_LOG_ALWAYS,
+ ("loopback client ipv6 port %s\n", DEFAULT_PORT));
rv = PR_SetNetAddr(PR_IpAddrLoopback, PR_AF_INET6,
DEFAULT_PORT,
&client[index].serverAddress);
+ }
}
else
{
+ TEST_LOG(cltsrv_log_file, TEST_LOG_ALWAYS,
+ ("client enumerate port %s\n", DEFAULT_PORT));
(void)PR_EnumerateHostEnt(
0, &host, DEFAULT_PORT, &client[index].serverAddress);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/fdcach.c
new/nspr-4.25/nspr/pr/tests/fdcach.c
--- old/nspr-4.24/nspr/pr/tests/fdcach.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/fdcach.c 2020-01-31 21:37:50.000000000
+0100
@@ -6,7 +6,7 @@
/*
* File: fdcach.c
* Description:
- * This test verifies that the fd cache and stack are working
+ * This test verifies that the fd cache is working
* correctly.
*/
@@ -18,7 +18,7 @@
/*
* Define ORDER_PRESERVED if the implementation of PR_SetFDCacheSize
* preserves the ordering of the fd's when moving them between the
- * cache and the stack.
+ * cache.
*/
#define ORDER_PRESERVED 1
@@ -35,12 +35,6 @@
PRFileDesc *savefds[NUM_FDS];
int numfds = sizeof(fds)/sizeof(fds[0]);
- /*
- * Switch between cache and stack when they are empty.
- * Then start with the fd cache.
- */
- PR_SetFDCacheSize(0, FD_CACHE_SIZE);
- PR_SetFDCacheSize(0, 0);
PR_SetFDCacheSize(0, FD_CACHE_SIZE);
/* Add some fd's to the fd cache. */
@@ -82,59 +76,6 @@
}
}
- /* Switch to the fd stack. */
- PR_SetFDCacheSize(0, 0);
-
- /*
- * Create some fd's. These fd's should come from
- * the fd stack.
- */
- for (i = 0; i < numfds; i++) {
- fds[i] = PR_NewTCPSocket();
- if (NULL == fds[i]) {
- fprintf(stderr, "PR_NewTCPSocket failed\n");
- exit(1);
- }
-#ifdef ORDER_PRESERVED
- if (fds[i] != savefds[numfds-1-i]) {
- fprintf(stderr, "fd stack malfunctioned\n");
- exit(1);
- }
-#else
- savefds[numfds-1-i] = fds[i];
-#endif
- }
- /* Put the fd's back to the fd stack. */
- for (i = 0; i < numfds; i++) {
- if (PR_Close(savefds[i]) == PR_FAILURE) {
- fprintf(stderr, "PR_Close failed\n");
- exit(1);
- }
- }
-
- /*
- * Now create some fd's and verify the LIFO ordering of
- * the fd stack.
- */
- for (i = 0; i < numfds; i++) {
- fds[i] = PR_NewTCPSocket();
- if (NULL == fds[i]) {
- fprintf(stderr, "PR_NewTCPSocket failed\n");
- exit(1);
- }
- if (fds[i] != savefds[numfds-1-i]) {
- fprintf(stderr, "fd stack malfunctioned\n");
- exit(1);
- }
- }
- /* Put the fd's back to the fd stack. */
- for (i = 0; i < numfds; i++) {
- if (PR_Close(savefds[i]) == PR_FAILURE) {
- fprintf(stderr, "PR_Close failed\n");
- exit(1);
- }
- }
-
/* Switch to the fd cache. */
PR_SetFDCacheSize(0, FD_CACHE_SIZE);
@@ -171,49 +112,6 @@
exit(1);
}
}
- for (i = 0; i < numfds; i++) {
- if (PR_Close(savefds[i]) == PR_FAILURE) {
- fprintf(stderr, "PR_Close failed\n");
- exit(1);
- }
- }
-
- /* Switch to the fd stack. */
- PR_SetFDCacheSize(0, 0);
-
- for (i = 0; i < numfds; i++) {
- fds[i] = PR_NewTCPSocket();
- if (NULL == fds[i]) {
- fprintf(stderr, "PR_NewTCPSocket failed\n");
- exit(1);
- }
-#ifdef ORDER_PRESERVED
- if (fds[i] != savefds[numfds-1-i]) {
- fprintf(stderr, "fd stack malfunctioned\n");
- exit(1);
- }
-#else
- savefds[numfds-1-i];
-#endif
- }
- for (i = 0; i < numfds; i++) {
- if (PR_Close(savefds[i]) == PR_FAILURE) {
- fprintf(stderr, "PR_Close failed\n");
- exit(1);
- }
- }
-
- for (i = 0; i < numfds; i++) {
- fds[i] = PR_NewTCPSocket();
- if (NULL == fds[i]) {
- fprintf(stderr, "PR_NewTCPSocket failed\n");
- exit(1);
- }
- if (fds[i] != savefds[numfds-1-i]) {
- fprintf(stderr, "fd stack malfunctioned\n");
- exit(1);
- }
- }
for (i = 0; i < numfds; i++) {
if (PR_Close(savefds[i]) == PR_FAILURE) {
fprintf(stderr, "PR_Close failed\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/foreign.c
new/nspr-4.25/nspr/pr/tests/foreign.c
--- old/nspr-4.24/nspr/pr/tests/foreign.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/foreign.c 2020-01-31 21:37:50.000000000
+0100
@@ -223,7 +223,8 @@
break;
case 6:
-#define TEMP_DIR "/tmp/"
+#define TEMP_DIR "./tmp"
+ PR_MkDir(TEMP_DIR, 0700);
dir = PR_OpenDir(TEMP_DIR);
DPRINTF((output,"Thread[0x%x] called PR_OpenDir\n",
PR_GetCurrentThread()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/fsync.c
new/nspr-4.25/nspr/pr/tests/fsync.c
--- old/nspr-4.24/nspr/pr/tests/fsync.c 2019-12-02 18:58:37.000000000 +0100
+++ new/nspr-4.25/nspr/pr/tests/fsync.c 2020-01-31 21:37:50.000000000 +0100
@@ -19,7 +19,7 @@
PR_fprintf(err, "\t-c Nuber of iterations (default: 10)\n");
PR_fprintf(err, "\t-S Sync the file (default: FALSE)\n");
PR_fprintf(err, "\t-K Size of file (K bytes) (default: 10)\n");
- PR_fprintf(err, "\t Name of file to write (default:
/usr/tmp/sync.dat)\n");
+ PR_fprintf(err, "\t Name of file to write (default:
./tmp-sync.dat)\n");
PR_fprintf(err, "\t-h This message and nothing else\n");
} /* Help */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/gethost.c
new/nspr-4.25/nspr/pr/tests/gethost.c
--- old/nspr-4.24/nspr/pr/tests/gethost.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/gethost.c 2020-01-31 21:37:50.000000000
+0100
@@ -18,7 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
-#define DEFAULT_HOST_NAME "mcom.com"
+#define DEFAULT_HOST_NAME "mozilla.org"
static void Help(void)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/layer.c
new/nspr-4.25/nspr/pr/tests/layer.c
--- old/nspr-4.24/nspr/pr/tests/layer.c 2019-12-02 18:58:37.000000000 +0100
+++ new/nspr-4.25/nspr/pr/tests/layer.c 2020-01-31 21:37:50.000000000 +0100
@@ -40,7 +40,19 @@
static PRIntn minor_iterations = 5;
static PRIntn major_iterations = 1;
static Verbosity verbosity = quiet;
-static PRUint16 default_port = 12273;
+
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+static PRUint16 default_port = 12273 PORT_INC_DO PORT_INC_3264;
static PRFileDesc *PushLayer(PRFileDesc *stack)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/lazyinit.c
new/nspr-4.25/nspr/pr/tests/lazyinit.c
--- old/nspr-4.24/nspr/pr/tests/lazyinit.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/lazyinit.c 2020-01-31 21:37:50.000000000
+0100
@@ -70,7 +70,7 @@
PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
break;
- case 3: file = PR_Open("/usr/tmp/", PR_RDONLY, 0);
+ case 3: file = PR_Open("./tmp-", PR_RDONLY, 0);
break;
case 4: udp = PR_NewUDPSocket();
@@ -79,7 +79,7 @@
case 5: tcp = PR_NewTCPSocket();
break;
- case 6: dir = PR_OpenDir("/usr/tmp/");
+ case 6: dir = PR_OpenDir("./tmp-");
break;
case 7: (void)PR_NewThreadPrivateIndex(&pdkey, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/multiwait.c
new/nspr-4.25/nspr/pr/tests/multiwait.c
--- old/nspr-4.24/nspr/pr/tests/multiwait.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/multiwait.c 2020-01-31 21:37:50.000000000
+0100
@@ -32,9 +32,20 @@
typedef enum Verbosity {silent, quiet, chatty, noisy} Verbosity;
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
static PRFileDesc *debug = NULL;
static PRInt32 desc_allocated = 0;
-static PRUint16 default_port = 12273;
+static PRUint16 default_port = 12273 PORT_INC_DO PORT_INC_3264;
static enum Verbosity verbosity = quiet;
static PRInt32 ops_required = 1000, ops_done = 0;
static PRThreadScope thread_scope = PR_LOCAL_THREAD;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/nameshm1.c
new/nspr-4.25/nspr/pr/tests/nameshm1.c
--- old/nspr-4.24/nspr/pr/tests/nameshm1.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/nameshm1.c 2020-01-31 21:37:50.000000000
+0100
@@ -72,9 +72,20 @@
#include <string.h>
#include <private/primpl.h>
-#define SEM_NAME1 "/tmp/nameshmSEM1"
-#define SEM_NAME2 "/tmp/nameshmSEM2"
-#define OPT_NAME "/tmp/xxxNSPRshm"
+#ifdef DEBUG
+#define SEM_D "D"
+#else
+#define SEM_D
+#endif
+#ifdef IS_64
+#define SEM_64 "64"
+#else
+#define SEM_64
+#endif
+
+#define SEM_NAME1 "/tmp/nameshmSEM1" SEM_D SEM_64
+#define SEM_NAME2 "/tmp/nameshmSEM2" SEM_D SEM_64
+#define OPT_NAME "/tmp/xxxNSPRshm" SEM_D SEM_64
#define EXE_NAME "nameshm1"
#define SEM_MODE 0666
#define SHM_MODE 0666
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/nblayer.c
new/nspr-4.25/nspr/pr/tests/nblayer.c
--- old/nspr-4.24/nspr/pr/tests/nblayer.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/nblayer.c 2020-01-31 21:37:50.000000000
+0100
@@ -53,7 +53,19 @@
static PRIntn minor_iterations = 5;
static PRIntn major_iterations = 1;
static Verbosity verbosity = quiet;
-static PRUint16 default_port = 12273;
+
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+static PRUint16 default_port = 12273 PORT_INC_DO PORT_INC_3264;
static PRFileDesc *PushLayer(PRFileDesc *stack)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/ntioto.c
new/nspr-4.25/nspr/pr/tests/ntioto.c
--- old/nspr-4.24/nspr/pr/tests/ntioto.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/ntioto.c 2020-01-31 21:37:50.000000000
+0100
@@ -57,7 +57,19 @@
/* JITTER_DEFAULT: the number of times AcceptThread() and JitterThread()
ping-pong */
#define JITTER_DEFAULT 100000
-#define BASE_PORT 9867
+
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define BASE_PORT 9867 PORT_INC_DO PORT_INC_3264
PRIntervalTime timeout;
PRNetAddr listenAddr;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/op_filnf.c
new/nspr-4.25/nspr/pr/tests/op_filnf.c
--- old/nspr-4.24/nspr/pr/tests/op_filnf.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/op_filnf.c 2020-01-31 21:37:50.000000000
+0100
@@ -31,7 +31,7 @@
int main(int argc, char **argv)
{
PR_STDIO_INIT();
- t1 = PR_Open("/usr/tmp/ttools/err03.tmp", PR_TRUNCATE | PR_RDWR, 0666);
+ t1 = PR_Open("./tmp-ttools/err03.tmp", PR_TRUNCATE | PR_RDWR, 0666);
if (t1 == NULL) {
if (PR_GetError() == PR_FILE_NOT_FOUND_ERROR) {
printf ("error code is %d \n", PR_GetError());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/provider.c
new/nspr-4.25/nspr/pr/tests/provider.c
--- old/nspr-4.24/nspr/pr/tests/provider.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/provider.c 2020-01-31 21:37:50.000000000
+0100
@@ -58,11 +58,22 @@
** This is the beginning of the test
*/
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
#define RECV_FLAGS 0
#define SEND_FLAGS 0
#define BUFFER_SIZE 1024
#define DEFAULT_BACKLOG 5
-#define DEFAULT_PORT 13000
+#define DEFAULT_PORT 13000 PORT_INC_DO PORT_INC_3264
#define DEFAULT_CLIENTS 1
#define ALLOWED_IN_ACCEPT 1
#define DEFAULT_CLIPPING 1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/runtests.pl
new/nspr-4.25/nspr/pr/tests/runtests.pl
--- old/nspr-4.24/nspr/pr/tests/runtests.pl 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/runtests.pl 2020-01-31 21:37:50.000000000
+0100
@@ -289,7 +289,6 @@
"logfile",
"logger",
"many_cv",
-"multiwait",
"nameshm1",
"nblayer",
"nonblock",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/runtests.sh
new/nspr-4.25/nspr/pr/tests/runtests.sh
--- old/nspr-4.24/nspr/pr/tests/runtests.sh 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/runtests.sh 2020-01-31 21:37:50.000000000
+0100
@@ -4,6 +4,20 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+if test -z $1
+then
+ echo "usage: $0 <path-to-dist>"
+ exit 1
+fi
+
+cd $1/lib
+ABS_LIB=$PWD
+cd -
+
+export DYLD_LIBRARY_PATH=${ABS_LIB}:${DYLD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=${ABS_LIB}:${LD_LIBRARY_PATH}
+export PATH=${ABS_LIB}:${PATH}
+
#
# runtests.sh
# Bourne shell script for nspr tests
@@ -57,12 +71,35 @@
#
#forktest (failed on IRIX)
+#multiwait - fails on Linux 64bit since NSPR v 4.4 from 2004.
#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
+#
+# all of the following were disabled in 2019 when reenabling CI tests,
+# because they failed on at least one of the platforms:
+#
+# cltsrv
+# cvar
+# gethost
+# getproto
+# layer
+# logfile
+# nameshm1
+# nblayer
+# nonblock
+# ntioto
+# op_2long
+# parent
+# provider
+# ranfile
+# socket
+# sockopt
+# vercheck
-LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
+#LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
+LOGFILE=nspr-test.log
#
# Tests run on all platforms
@@ -80,9 +117,7 @@
attach
bigfile
cleanup
-cltsrv
concur
-cvar
cvar2
dlltest
dtoa
@@ -93,8 +128,6 @@
foreign
formattm
fsync
-gethost
-getproto
i2l
initclk
inrval
@@ -108,27 +141,18 @@
joinku
joinuk
joinuu
-layer
lazyinit
libfilename
lltest
lock
lockfile
-logfile
logger
many_cv
-multiwait
-nameshm1
-nblayer
-nonblock
-ntioto
ntoh
-op_2long
op_excl
op_filnf
op_filok
op_nofil
-parent
parsetm
peek
perf
@@ -141,10 +165,8 @@
prftest
prfz
primblok
-provider
prpollml
pushtop
-ranfile
randseed
reinit
rwlocktest
@@ -164,8 +186,6 @@
servr_uu
short_thread
sigpipe
-socket
-sockopt
sockping
sprintf
stack
@@ -181,7 +201,6 @@
timetest
tpd
udpsrv
-vercheck
version
writev
xnotify
@@ -211,7 +230,7 @@
if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [
$OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then
for prog in $TESTS
do
- printf "$prog"
+ printf "$prog (`date +%T`)"
printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1
./$prog >> ${LOGFILE} 2>&1
if [ 0 = $? ] ; then
@@ -225,7 +244,7 @@
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 &
@@ -249,22 +268,10 @@
done
fi;
+if [ $rval -ne 0 ]; then
+ cat ${LOGFILE}
+fi
+
printf "END\t\t\t`date`\n"
exit $rval
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/sel_spd.c
new/nspr-4.25/nspr/pr/tests/sel_spd.c
--- old/nspr-4.24/nspr/pr/tests/sel_spd.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/sel_spd.c 2020-01-31 21:37:50.000000000
+0100
@@ -16,7 +16,18 @@
#include <errno.h>
#include <string.h>
-#define PORT_BASE 19000
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define PORT_BASE 19000 PORT_INC_DO PORT_INC_3264
typedef struct timer_slot_t {
unsigned long d_connect;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/sema.c
new/nspr-4.25/nspr/pr/tests/sema.c
--- old/nspr-4.24/nspr/pr/tests/sema.c 2019-12-02 18:58:37.000000000 +0100
+++ new/nspr-4.25/nspr/pr/tests/sema.c 2020-01-31 21:37:50.000000000 +0100
@@ -8,8 +8,19 @@
#include <stdio.h>
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_NAME2 "/tmp/bar.sem"
+#ifdef DEBUG
+#define SEM_D "D"
+#else
+#define SEM_D
+#endif
+#ifdef IS_64
+#define SEM_64 "64"
+#else
+#define SEM_64
+#endif
+
+#define SEM_NAME1 "/tmp/foo.sem" SEM_D SEM_64
+#define SEM_NAME2 "/tmp/bar.sem" SEM_D SEM_64
#define SEM_MODE 0666
#define ITERATIONS 1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/semaerr.c
new/nspr-4.25/nspr/pr/tests/semaerr.c
--- old/nspr-4.24/nspr/pr/tests/semaerr.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/semaerr.c 2020-01-31 21:37:50.000000000
+0100
@@ -8,8 +8,19 @@
#include <stdio.h>
-#define NO_SUCH_SEM_NAME "/tmp/nosuchsem.sem"
-#define SEM_NAME1 "/tmp/foo.sem"
+#ifdef DEBUG
+#define SEM_D "D"
+#else
+#define SEM_D
+#endif
+#ifdef IS_64
+#define SEM_64 "64"
+#else
+#define SEM_64
+#endif
+
+#define NO_SUCH_SEM_NAME "/tmp/nosuchsem.sem" SEM_D SEM_64
+#define SEM_NAME1 "/tmp/foo.sem" SEM_D SEM_64
#define EXE_NAME "semaerr1"
#define SEM_MODE 0666
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/semaerr1.c
new/nspr-4.25/nspr/pr/tests/semaerr1.c
--- old/nspr-4.24/nspr/pr/tests/semaerr1.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/semaerr1.c 2020-01-31 21:37:50.000000000
+0100
@@ -8,8 +8,19 @@
#include <stdio.h>
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_NAME2 "/tmp/bar.sem"
+#ifdef DEBUG
+#define SEM_D "D"
+#else
+#define SEM_D
+#endif
+#ifdef IS_64
+#define SEM_64 "64"
+#else
+#define SEM_64
+#endif
+
+#define SEM_NAME1 "/tmp/foo.sem" SEM_D SEM_64
+#define SEM_NAME2 "/tmp/bar.sem" SEM_D SEM_64
#define SEM_MODE 0666
static PRBool debug_mode = PR_FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/semaping.c
new/nspr-4.25/nspr/pr/tests/semaping.c
--- old/nspr-4.24/nspr/pr/tests/semaping.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/semaping.c 2020-01-31 21:37:50.000000000
+0100
@@ -8,9 +8,20 @@
#include <stdio.h>
-#define SHM_NAME "/tmp/counter"
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_NAME2 "/tmp/bar.sem"
+#ifdef DEBUG
+#define SEM_D "D"
+#else
+#define SEM_D
+#endif
+#ifdef IS_64
+#define SEM_64 "64"
+#else
+#define SEM_64
+#endif
+
+#define SHM_NAME "/tmp/counter" SEM_D SEM_64
+#define SEM_NAME1 "/tmp/foo.sem" SEM_D SEM_64
+#define SEM_NAME2 "/tmp/bar.sem" SEM_D SEM_64
#define EXE_NAME "semapong"
#define SEM_MODE 0666
#define SHM_MODE 0666
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/semapong.c
new/nspr-4.25/nspr/pr/tests/semapong.c
--- old/nspr-4.24/nspr/pr/tests/semapong.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/semapong.c 2020-01-31 21:37:50.000000000
+0100
@@ -8,9 +8,20 @@
#include <stdio.h>
-#define SHM_NAME "/tmp/counter"
-#define SEM_NAME1 "/tmp/foo.sem"
-#define SEM_NAME2 "/tmp/bar.sem"
+#ifdef DEBUG
+#define SEM_D "D"
+#else
+#define SEM_D
+#endif
+#ifdef IS_64
+#define SEM_64 "64"
+#else
+#define SEM_64
+#endif
+
+#define SHM_NAME "/tmp/counter" SEM_D SEM_64
+#define SEM_NAME1 "/tmp/foo.sem" SEM_D SEM_64
+#define SEM_NAME2 "/tmp/bar.sem" SEM_D SEM_64
#define ITERATIONS 1000
static PRBool debug_mode = PR_FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/socket.c
new/nspr-4.25/nspr/pr/tests/socket.c
--- old/nspr-4.24/nspr/pr/tests/socket.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/socket.c 2020-01-31 21:37:50.000000000
+0100
@@ -45,9 +45,9 @@
char *SMALL_FILE_NAME = "prsmallf";
char *LARGE_FILE_NAME = "prlargef";
#else
-char *TEST_DIR = "/tmp/prsocket_test_dir";
-char *SMALL_FILE_NAME = "/tmp/prsocket_test_dir/small_file";
-char *LARGE_FILE_NAME = "/tmp/prsocket_test_dir/large_file";
+char *TEST_DIR = "./tmp-prsocket_test_dir";
+char *SMALL_FILE_NAME = "./tmp-prsocket_test_dir/small_file";
+char *LARGE_FILE_NAME = "./tmp-prsocket_test_dir/large_file";
#endif
#define SMALL_FILE_SIZE (3 * 1024) /* 3 KB */
#define SMALL_FILE_OFFSET_1 (512)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/testfile.c
new/nspr-4.25/nspr/pr/tests/testfile.c
--- old/nspr-4.24/nspr/pr/tests/testfile.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/testfile.c 2020-01-31 21:37:50.000000000
+0100
@@ -71,7 +71,7 @@
char *FILE_NAME = "pr_testfile";
char *HIDDEN_FILE_NAME = "hidden_pr_testfile";
#else
-char *TEST_DIR = "/tmp/testfile_dir";
+char *TEST_DIR = "./tmp-testfile_dir";
char *FILE_NAME = "pr_testfile";
char *HIDDEN_FILE_NAME = ".hidden_pr_testfile";
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/thruput.c
new/nspr-4.25/nspr/pr/tests/thruput.c
--- old/nspr-4.24/nspr/pr/tests/thruput.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/thruput.c 2020-01-31 21:37:50.000000000
+0100
@@ -27,7 +27,20 @@
#include "plgetopt.h"
#define ADDR_BUFFER 100
-#define PORT_NUMBER 51877
+
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define PORT_NUMBER 51877 PORT_INC_DO PORT_INC_3264
+
#define SAMPLING_INTERVAL 10
#define BUFFER_SIZE (32 * 1024)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/tmoacc.c
new/nspr-4.25/nspr/pr/tests/tmoacc.c
--- old/nspr-4.24/nspr/pr/tests/tmoacc.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/tmoacc.c 2020-01-31 21:37:50.000000000
+0100
@@ -11,7 +11,18 @@
#include "plerror.h"
#include "plgetopt.h"
-#define BASE_PORT 9867
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define BASE_PORT 9867 PORT_INC_DO PORT_INC_3264
#define DEFAULT_THREADS 1
#define DEFAULT_BACKLOG 10
#define DEFAULT_TIMEOUT 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/tmocon.c
new/nspr-4.25/nspr/pr/tests/tmocon.c
--- old/nspr-4.24/nspr/pr/tests/tmocon.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/tmocon.c 2020-01-31 21:37:50.000000000
+0100
@@ -50,7 +50,18 @@
}
#endif
-#define BASE_PORT 9867
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define BASE_PORT 9867 PORT_INC_DO PORT_INC_3264
#define DEFAULT_DALLY 1
#define DEFAULT_THREADS 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/vercheck.c
new/nspr-4.25/nspr/pr/tests/vercheck.c
--- old/nspr-4.24/nspr/pr/tests/vercheck.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/vercheck.c 2020-01-31 21:37:50.000000000
+0100
@@ -41,7 +41,7 @@
"4.10.5", "4.10.6", "4.10.7", "4.10.8", "4.10.9",
"4.10.10", "4.11", "4.12", "4.13", "4.14", "4.15",
"4.16", "4.17", "4.18", "4.19", "4.20", "4.21", "4.22",
- "4.23",
+ "4.23", "4.24",
PR_VERSION
};
@@ -57,8 +57,8 @@
"3.0", "3.0.1",
"3.1", "3.1.1", "3.1.2", "3.1.3",
"3.5", "3.5.1",
- "4.24.1",
- "4.25", "4.25.1",
+ "4.25.1",
+ "4.26", "4.26.1",
"10.0", "11.1", "12.14.20"
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/nspr-4.24/nspr/pr/tests/writev.c
new/nspr-4.25/nspr/pr/tests/writev.c
--- old/nspr-4.24/nspr/pr/tests/writev.c 2019-12-02 18:58:37.000000000
+0100
+++ new/nspr-4.25/nspr/pr/tests/writev.c 2020-01-31 21:37:50.000000000
+0100
@@ -15,7 +15,18 @@
#define IOV_MAX 16
#endif
-#define BASE_PORT 9867
+#ifdef DEBUG
+#define PORT_INC_DO +100
+#else
+#define PORT_INC_DO
+#endif
+#ifdef IS_64
+#define PORT_INC_3264 +200
+#else
+#define PORT_INC_3264
+#endif
+
+#define BASE_PORT 9867 PORT_INC_DO PORT_INC_3264
int PR_CALLBACK Writev(int argc, char **argv)
{
