diff -Nru nspr-4.24/debian/changelog nspr-4.25/debian/changelog --- nspr-4.24/debian/changelog 2019-12-27 22:59:11.000000000 +0000 +++ nspr-4.25/debian/changelog 2020-03-10 23:00:04.000000000 +0000 @@ -1,3 +1,10 @@ +nspr (2:4.25-1) unstable; urgency=medium + + * New upstream release. + * debian/rules: Adapt to changes to runtests.sh. + + -- Mike Hommey Wed, 11 Mar 2020 08:00:04 +0900 + nspr (2:4.24-1) unstable; urgency=medium * New upstream release. diff -Nru nspr-4.24/debian/rules nspr-4.25/debian/rules --- nspr-4.24/debian/rules 2019-08-18 13:17:24.000000000 +0000 +++ nspr-4.25/debian/rules 2020-03-10 23:00:04.000000000 +0000 @@ -84,7 +84,7 @@ # Skip socket because it freezes. # Skip getproto because it fails on some buildds. # Skip nblayer because it freezes on armel. - cd nspr/pr/tests && grep -v '^$fdcach\|gethost\|getproto\|nblayer\|peek\|socket\|vercheck$$$' ./runtests.sh | LD_LIBRARY_PATH=$(CURDIR)/nspr/dist/bin$(addprefix :,$(LD_LIBRARY_PATH)) sh + cd nspr/pr/tests && grep -v '^$fdcach\|gethost\|getproto\|nblayer\|peek\|socket\|vercheck$$$' ./runtests.sh | sh - $(CURDIR)/nspr/dist cd nspr/lib/tests && LD_LIBRARY_PATH=$(CURDIR)/nspr/dist/bin$(addprefix :,$(LD_LIBRARY_PATH)) ./base64t cd nspr/lib/tests && LD_LIBRARY_PATH=$(CURDIR)/nspr/dist/bin$(addprefix :,$(LD_LIBRARY_PATH)) ./string endif diff -Nru nspr-4.24/nspr/configure nspr-4.25/nspr/configure --- nspr-4.24/nspr/configure 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/configure 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/configure.in nspr-4.25/nspr/configure.in --- nspr-4.24/nspr/configure.in 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/configure.in 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/.hg_archival.txt nspr-4.25/nspr/.hg_archival.txt --- nspr-4.24/nspr/.hg_archival.txt 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/.hg_archival.txt 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/include/md/_linux.cfg nspr-4.25/nspr/pr/include/md/_linux.cfg --- nspr-4.24/nspr/pr/include/md/_linux.cfg 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/include/md/_linux.cfg 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/include/md/_linux.h nspr-4.25/nspr/pr/include/md/_linux.h --- nspr-4.24/nspr/pr/include/md/_linux.h 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/include/md/_linux.h 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/include/prinit.h nspr-4.25/nspr/pr/include/prinit.h --- nspr-4.24/nspr/pr/include/prinit.h 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/include/prinit.h 2020-01-31 20:37:50.000000000 +0000 @@ -31,9 +31,9 @@ ** The format of the version string is ** ".[.] []" */ -#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 -Nru nspr-4.24/nspr/pr/src/md/windows/ntio.c nspr-4.25/nspr/pr/src/md/windows/ntio.c --- nspr-4.24/nspr/pr/src/md/windows/ntio.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/src/md/windows/ntio.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/acceptread.c nspr-4.25/nspr/pr/tests/acceptread.c --- nspr-4.24/nspr/pr/tests/acceptread.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/acceptread.c 2020-01-31 20:37:50.000000000 +0000 @@ -14,7 +14,18 @@ #include -#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 -Nru nspr-4.24/nspr/pr/tests/acceptreademu.c nspr-4.25/nspr/pr/tests/acceptreademu.c --- nspr-4.24/nspr/pr/tests/acceptreademu.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/acceptreademu.c 2020-01-31 20:37:50.000000000 +0000 @@ -20,7 +20,18 @@ #include -#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 -Nru nspr-4.24/nspr/pr/tests/append.c nspr-4.25/nspr/pr/tests/append.c --- nspr-4.24/nspr/pr/tests/append.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/append.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/cltsrv.c nspr-4.25/nspr/pr/tests/cltsrv.c --- nspr-4.24/nspr/pr/tests/cltsrv.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/cltsrv.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/fdcach.c nspr-4.25/nspr/pr/tests/fdcach.c --- nspr-4.24/nspr/pr/tests/fdcach.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/fdcach.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/foreign.c nspr-4.25/nspr/pr/tests/foreign.c --- nspr-4.24/nspr/pr/tests/foreign.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/foreign.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/fsync.c nspr-4.25/nspr/pr/tests/fsync.c --- nspr-4.24/nspr/pr/tests/fsync.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/fsync.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/gethost.c nspr-4.25/nspr/pr/tests/gethost.c --- nspr-4.24/nspr/pr/tests/gethost.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/gethost.c 2020-01-31 20:37:50.000000000 +0000 @@ -18,7 +18,7 @@ #include #include -#define DEFAULT_HOST_NAME "mcom.com" +#define DEFAULT_HOST_NAME "mozilla.org" static void Help(void) { diff -Nru nspr-4.24/nspr/pr/tests/layer.c nspr-4.25/nspr/pr/tests/layer.c --- nspr-4.24/nspr/pr/tests/layer.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/layer.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/lazyinit.c nspr-4.25/nspr/pr/tests/lazyinit.c --- nspr-4.24/nspr/pr/tests/lazyinit.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/lazyinit.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/Makefile.in nspr-4.25/nspr/pr/tests/Makefile.in --- nspr-4.24/nspr/pr/tests/Makefile.in 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/Makefile.in 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/multiwait.c nspr-4.25/nspr/pr/tests/multiwait.c --- nspr-4.24/nspr/pr/tests/multiwait.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/multiwait.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/nameshm1.c nspr-4.25/nspr/pr/tests/nameshm1.c --- nspr-4.24/nspr/pr/tests/nameshm1.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/nameshm1.c 2020-01-31 20:37:50.000000000 +0000 @@ -72,9 +72,20 @@ #include #include -#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 -Nru nspr-4.24/nspr/pr/tests/nblayer.c nspr-4.25/nspr/pr/tests/nblayer.c --- nspr-4.24/nspr/pr/tests/nblayer.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/nblayer.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/ntioto.c nspr-4.25/nspr/pr/tests/ntioto.c --- nspr-4.24/nspr/pr/tests/ntioto.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/ntioto.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/op_filnf.c nspr-4.25/nspr/pr/tests/op_filnf.c --- nspr-4.24/nspr/pr/tests/op_filnf.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/op_filnf.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/provider.c nspr-4.25/nspr/pr/tests/provider.c --- nspr-4.24/nspr/pr/tests/provider.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/provider.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/runtests.pl nspr-4.25/nspr/pr/tests/runtests.pl --- nspr-4.24/nspr/pr/tests/runtests.pl 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/runtests.pl 2020-01-31 20:37:50.000000000 +0000 @@ -289,7 +289,6 @@ "logfile", "logger", "many_cv", -"multiwait", "nameshm1", "nblayer", "nonblock", diff -Nru nspr-4.24/nspr/pr/tests/runtests.sh nspr-4.25/nspr/pr/tests/runtests.sh --- nspr-4.24/nspr/pr/tests/runtests.sh 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/runtests.sh 2020-01-31 20:37:50.000000000 +0000 @@ -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 " + 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 -Nru nspr-4.24/nspr/pr/tests/sel_spd.c nspr-4.25/nspr/pr/tests/sel_spd.c --- nspr-4.24/nspr/pr/tests/sel_spd.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/sel_spd.c 2020-01-31 20:37:50.000000000 +0000 @@ -16,7 +16,18 @@ #include #include -#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 -Nru nspr-4.24/nspr/pr/tests/sema.c nspr-4.25/nspr/pr/tests/sema.c --- nspr-4.24/nspr/pr/tests/sema.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/sema.c 2020-01-31 20:37:50.000000000 +0000 @@ -8,8 +8,19 @@ #include -#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 -Nru nspr-4.24/nspr/pr/tests/semaerr1.c nspr-4.25/nspr/pr/tests/semaerr1.c --- nspr-4.24/nspr/pr/tests/semaerr1.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/semaerr1.c 2020-01-31 20:37:50.000000000 +0000 @@ -8,8 +8,19 @@ #include -#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 -Nru nspr-4.24/nspr/pr/tests/semaerr.c nspr-4.25/nspr/pr/tests/semaerr.c --- nspr-4.24/nspr/pr/tests/semaerr.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/semaerr.c 2020-01-31 20:37:50.000000000 +0000 @@ -8,8 +8,19 @@ #include -#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 -Nru nspr-4.24/nspr/pr/tests/semaping.c nspr-4.25/nspr/pr/tests/semaping.c --- nspr-4.24/nspr/pr/tests/semaping.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/semaping.c 2020-01-31 20:37:50.000000000 +0000 @@ -8,9 +8,20 @@ #include -#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 -Nru nspr-4.24/nspr/pr/tests/semapong.c nspr-4.25/nspr/pr/tests/semapong.c --- nspr-4.24/nspr/pr/tests/semapong.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/semapong.c 2020-01-31 20:37:50.000000000 +0000 @@ -8,9 +8,20 @@ #include -#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 -Nru nspr-4.24/nspr/pr/tests/socket.c nspr-4.25/nspr/pr/tests/socket.c --- nspr-4.24/nspr/pr/tests/socket.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/socket.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/testfile.c nspr-4.25/nspr/pr/tests/testfile.c --- nspr-4.24/nspr/pr/tests/testfile.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/testfile.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/thruput.c nspr-4.25/nspr/pr/tests/thruput.c --- nspr-4.24/nspr/pr/tests/thruput.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/thruput.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/tmoacc.c nspr-4.25/nspr/pr/tests/tmoacc.c --- nspr-4.24/nspr/pr/tests/tmoacc.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/tmoacc.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/tmocon.c nspr-4.25/nspr/pr/tests/tmocon.c --- nspr-4.24/nspr/pr/tests/tmocon.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/tmocon.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/vercheck.c nspr-4.25/nspr/pr/tests/vercheck.c --- nspr-4.24/nspr/pr/tests/vercheck.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/vercheck.c 2020-01-31 20:37:50.000000000 +0000 @@ -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 -Nru nspr-4.24/nspr/pr/tests/writev.c nspr-4.25/nspr/pr/tests/writev.c --- nspr-4.24/nspr/pr/tests/writev.c 2019-12-02 17:58:37.000000000 +0000 +++ nspr-4.25/nspr/pr/tests/writev.c 2020-01-31 20:37:50.000000000 +0000 @@ -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) {