Attachment 206784 Details for Bug 239986 – svn-diff-nspr_v3

[patch] svn-diff-nspr_v3

svn-diff-nspr (text/plain), 15.04 KB, created by Walter Schwarzenfeld on 2019-08-22 09:58:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2019-08-22 09:58:18 UTC

Size: 15.04 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 509423)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	nspr
> DISTVERSION=	4.22
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
> 
>Index: files/patch-pr_tests_attach.c
>===================================================================
>--- files/patch-pr_tests_attach.c	(nonexistent)
>+++ files/patch-pr_tests_attach.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- pr/tests/attach.c.orig	2019-08-20 11:59:48 UTC
>++++ pr/tests/attach.c
>+@@ -266,7 +266,7 @@ int main(int argc, char **argv)
>+ 	    "either this platform does not have native threads or the\n"
>+ 	    "test needs to be written for this platform.\n");
>+ 	goto exit_now;
>+-
>++#endif
>+ exit_now:
>+    if(failed_already)	
>+ 		return 1;
>
>Property changes on: files/patch-pr_tests_attach.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pr_tests_nonblock.c
>===================================================================
>--- files/patch-pr_tests_nonblock.c	(nonexistent)
>+++ files/patch-pr_tests_nonblock.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- pr/tests/nonblock.c.orig	2019-08-20 12:01:46 UTC
>++++ pr/tests/nonblock.c
>+@@ -23,6 +23,9 @@
>+ ** Make win16 unit_time interval 300 milliseconds, others get 100
>+ */
>+ #define UNIT_TIME  200       /* unit time in milliseconds */
>++#elif defined(SYMBIAN)
>++#define UNIT_TIME  5000      /* unit time in milliseconds */
>++#else
>+ #define UNIT_TIME  100       /* unit time in milliseconds */
>+ #endif
>+ #define CHUNK_SIZE 10
>
>Property changes on: files/patch-pr_tests_nonblock.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pr_tests_stack.c
>===================================================================
>--- files/patch-pr_tests_stack.c	(nonexistent)
>+++ files/patch-pr_tests_stack.c	(working copy)
>@@ -0,0 +1,22 @@
>+--- pr/tests/stack.c.orig	2019-08-20 12:03:34 UTC
>++++ pr/tests/stack.c
>+@@ -53,8 +53,8 @@ PRFileDesc  *errhandle;
>+ 
>+ int main(int argc, char **argv)
>+ {
>+-#if defined(__WINS__))
>+-    PRInt32 rv, cnt, sum;
>++#if defined(__WINS__)
>++    PRInt32 cnt, sum;
>+ 	DataRecord	*Item;
>+ 	PRStack		*list1, *list2;
>+ 	PRStackElem	*node;
>+@@ -209,7 +209,7 @@ int main(int argc, char **argv)
>+ static void stackop(void *thread_arg)
>+ {
>+     PRInt32 val, cnt, index, loops;
>+-	DataRecord	*Items, *Item;
>++	DataRecord	*Items;
>+ 	PRStack		*list1, *list2;
>+ 	PRStackElem	*node;
>+ 	stack_data *arg = (stack_data *) thread_arg;
>
>Property changes on: files/patch-pr_tests_stack.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pr_tests_testfile.c
>===================================================================
>--- files/patch-pr_tests_testfile.c	(nonexistent)
>+++ files/patch-pr_tests_testfile.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- pr/tests/testfile.c.orig	2019-08-20 12:25:48 UTC
>++++ pr/tests/testfile.c
>+@@ -78,7 +78,7 @@ char *TEST_DIR = "/tmp/testfile_dir";
>+ #endif
>+ char *FILE_NAME = "pr_testfile";
>+ char *HIDDEN_FILE_NAME = ".hidden_pr_testfile";
>+-#endif
>++//#endif
>+ buffer *in_buf, *out_buf;
>+ char pathname[256], renamename[256];
>+ #ifdef WINCE
>
>Property changes on: files/patch-pr_tests_testfile.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-tests
>===================================================================
>--- files/patch-tests	(revision 509423)
>+++ files/patch-tests	(working copy)
>@@ -1883,26 +1883,6 @@
>  	PR_smprintf_free(s);
>  	exit(-1);
>      }
>---- pr/tests/stack.c.orig	2019-08-19 14:12:12 UTC
>-+++ pr/tests/stack.c
>-@@ -54,7 +54,7 @@ PRFileDesc  *errhandle;
>- int main(int argc, char **argv)
>- {
>- #if defined(__WINS__))
>--    PRInt32 rv, cnt, sum;
>-+    PRInt32 cnt, sum;
>- 	DataRecord	*Item;
>- 	PRStack		*list1, *list2;
>- 	PRStackElem	*node;
>-@@ -209,7 +209,7 @@ int main(int argc, char **argv)
>- static void stackop(void *thread_arg)
>- {
>-     PRInt32 val, cnt, index, loops;
>--	DataRecord	*Items, *Item;
>-+	DataRecord	*Items;
>- 	PRStack		*list1, *list2;
>- 	PRStackElem	*node;
>- 	stack_data *arg = (stack_data *) thread_arg;
> --- pr/tests/suspend.c.orig	2019-08-19 14:12:12 UTC
> +++ pr/tests/suspend.c
> @@ -21,14 +21,14 @@ void PR_CALLBACK
>Index: Makefile
>===================================================================
>--- Makefile	(revision 509423)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	nspr
> DISTVERSION=	4.22
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
> 
>Index: files/patch-pr_tests_attach.c
>===================================================================
>--- files/patch-pr_tests_attach.c	(nonexistent)
>+++ files/patch-pr_tests_attach.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- pr/tests/attach.c.orig	2019-08-20 11:59:48 UTC
>++++ pr/tests/attach.c
>+@@ -266,7 +266,7 @@ int main(int argc, char **argv)
>+ 	    "either this platform does not have native threads or the\n"
>+ 	    "test needs to be written for this platform.\n");
>+ 	goto exit_now;
>+-
>++#endif
>+ exit_now:
>+    if(failed_already)	
>+ 		return 1;
>
>Property changes on: files/patch-pr_tests_attach.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pr_tests_nonblock.c
>===================================================================
>--- files/patch-pr_tests_nonblock.c	(nonexistent)
>+++ files/patch-pr_tests_nonblock.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- pr/tests/nonblock.c.orig	2019-08-20 12:01:46 UTC
>++++ pr/tests/nonblock.c
>+@@ -23,6 +23,9 @@
>+ ** Make win16 unit_time interval 300 milliseconds, others get 100
>+ */
>+ #define UNIT_TIME  200       /* unit time in milliseconds */
>++#elif defined(SYMBIAN)
>++#define UNIT_TIME  5000      /* unit time in milliseconds */
>++#else
>+ #define UNIT_TIME  100       /* unit time in milliseconds */
>+ #endif
>+ #define CHUNK_SIZE 10
>
>Property changes on: files/patch-pr_tests_nonblock.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pr_tests_runtests.sh
>===================================================================
>--- files/patch-pr_tests_runtests.sh	(nonexistent)
>+++ files/patch-pr_tests_runtests.sh	(working copy)
>@@ -0,0 +1,113 @@
>+--- pr/tests/runtests.sh.orig	2019-08-22 07:22:00 UTC
>++++ pr/tests/runtests.sh
>+@@ -56,9 +56,6 @@ fi
>+ # Tests not run (but should)
>+ #
>+ 
>+-#forktest (failed on IRIX)
>+-#nbconn - fails on some platforms 
>+-#poll_er - fails on some platforms? limited use?
>+ #prpoll -  the bad-FD test needs to be moved to a different test
>+ #sleep	-  specific to OS/2
>+ 
>+@@ -84,13 +81,12 @@ cltsrv
>+ concur
>+ cvar
>+ cvar2
>+-dlltest
>+ dtoa
>+ errcodes
>+ exit
>+-fdcach
>+ fileio
>+ foreign
>++forktest
>+ formattm
>+ fsync
>+ gethost
>+@@ -98,7 +94,6 @@ getproto
>+ i2l
>+ initclk
>+ inrval
>+-instrumt
>+ intrio
>+ intrupt
>+ io_timeout
>+@@ -110,7 +105,6 @@ joinuk
>+ joinuu
>+ layer
>+ lazyinit
>+-libfilename
>+ lltest
>+ lock
>+ lockfile
>+@@ -119,6 +113,7 @@ logger
>+ many_cv
>+ multiwait
>+ nameshm1
>++nbconn
>+ nblayer
>+ nonblock
>+ ntioto
>+@@ -135,6 +130,7 @@ perf
>+ pipeping
>+ pipeping2
>+ pipeself
>++poll_er
>+ poll_nm
>+ poll_to
>+ pollable
>+@@ -207,8 +203,8 @@ OBJDIR=`basename $PWD`
>+ printf "\nNSPR Test Results - $OBJDIR\n\n"
>+ printf "BEGIN\t\t\t`date`\n"
>+ printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n"
>+-printf "Test\t\t\tResult\n\n"
>+-if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then
>++printf "            Test\t\t\tResult\n\n"
>++if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2"] || [ $OS_PLATFORM = "FreeBSD" ] ; then
>+ 	for prog in $TESTS
>+ 	do
>+ 		printf "$prog"
>+@@ -225,10 +221,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ 
>+ else
>+ 	for prog in $TESTS
>+ 	do
>+-		printf "$prog"
>+-		printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1
>+-		export test_rval
>+-		./$prog >> ${LOGFILE} 2>&1 &
>++		printf %16s $prog
>++		./$prog >> $prog.output 2>&1 &
>+ 		test_pid=$!
>+ 		sleep_pid=0
>+ 		if test -n "$TEST_TIMEOUT" && test "$TEST_TIMEOUT" -gt 0
>+@@ -243,28 +237,11 @@ else
>+ 			printf "\t\t\tPassed\n";
>+ 		else
>+ 			printf "\t\t\tFAILED\n";
>++			sed "s,^,	$prog:	," < $prog.output
>+ 			rval=1
>+ 		fi;
>+-		printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1
>+ 	done
>+ fi;
>+ 
>+ printf "END\t\t\t`date`\n"
>+ exit $rval
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>+-
>
>Property changes on: files/patch-pr_tests_runtests.sh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:executable
>## -0,0 +1 ##
>+*
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pr_tests_stack.c
>===================================================================
>--- files/patch-pr_tests_stack.c	(nonexistent)
>+++ files/patch-pr_tests_stack.c	(working copy)
>@@ -0,0 +1,22 @@
>+--- pr/tests/stack.c.orig	2019-08-20 12:03:34 UTC
>++++ pr/tests/stack.c
>+@@ -53,8 +53,8 @@ PRFileDesc  *errhandle;
>+ 
>+ int main(int argc, char **argv)
>+ {
>+-#if defined(__WINS__))
>+-    PRInt32 rv, cnt, sum;
>++#if defined(__WINS__)
>++    PRInt32 cnt, sum;
>+ 	DataRecord	*Item;
>+ 	PRStack		*list1, *list2;
>+ 	PRStackElem	*node;
>+@@ -209,7 +209,7 @@ int main(int argc, char **argv)
>+ static void stackop(void *thread_arg)
>+ {
>+     PRInt32 val, cnt, index, loops;
>+-	DataRecord	*Items, *Item;
>++	DataRecord	*Items;
>+ 	PRStack		*list1, *list2;
>+ 	PRStackElem	*node;
>+ 	stack_data *arg = (stack_data *) thread_arg;
>
>Property changes on: files/patch-pr_tests_stack.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-pr_tests_testfile.c
>===================================================================
>--- files/patch-pr_tests_testfile.c	(nonexistent)
>+++ files/patch-pr_tests_testfile.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- pr/tests/testfile.c.orig	2019-08-20 12:25:48 UTC
>++++ pr/tests/testfile.c
>+@@ -78,7 +78,7 @@ char *TEST_DIR = "/tmp/testfile_dir";
>+ #endif
>+ char *FILE_NAME = "pr_testfile";
>+ char *HIDDEN_FILE_NAME = ".hidden_pr_testfile";
>+-#endif
>++//#endif
>+ buffer *in_buf, *out_buf;
>+ char pathname[256], renamename[256];
>+ #ifdef WINCE
>
>Property changes on: files/patch-pr_tests_testfile.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-tests
>===================================================================
>--- files/patch-tests	(revision 509423)
>+++ files/patch-tests	(working copy)
>@@ -1036,85 +1036,6 @@
>          programName, writesMin, writesTot * 1000 / durationTot, writesMax);
>  
>      PR_DestroyCondVar(cv);
>---- pr/tests/runtests.sh.orig	2019-08-19 14:12:12 UTC
>-+++ pr/tests/runtests.sh
>-@@ -56,9 +56,6 @@ fi
>- # Tests not run (but should)
>- #
>- 
>--#forktest (failed on IRIX)
>--#nbconn - fails on some platforms 
>--#poll_er - fails on some platforms? limited use?
>- #prpoll -  the bad-FD test needs to be moved to a different test
>- #sleep	-  specific to OS/2
>- 
>-@@ -91,6 +88,7 @@ exit
>- fdcach
>- fileio
>- foreign
>-+forktest
>- formattm
>- fsync
>- gethost
>-@@ -98,7 +96,6 @@ getproto
>- i2l
>- initclk
>- inrval
>--instrumt
>- intrio
>- intrupt
>- io_timeout
>-@@ -119,6 +116,7 @@ logger
>- many_cv
>- multiwait
>- nameshm1
>-+nbconn
>- nblayer
>- nonblock
>- ntioto
>-@@ -135,6 +133,7 @@ perf
>- pipeping
>- pipeping2
>- pipeself
>-+poll_er
>- poll_nm
>- poll_to
>- pollable
>-@@ -207,7 +206,7 @@ OBJDIR=`basename $PWD`
>- printf "\nNSPR Test Results - $OBJDIR\n\n"
>- printf "BEGIN\t\t\t`date`\n"
>- printf "NSPR_TEST_LOGFILE\t${LOGFILE}\n\n"
>--printf "Test\t\t\tResult\n\n"
>-+printf "            Test\t\t\tResult\n\n"
>- if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM = "Windows_98" ] || [ $OS_PLATFORM = "Windows_NT" ] || [ $OS_PLATFORM = "OS/2" ] ; then
>- 	for prog in $TESTS
>- 	do
>-@@ -225,10 +224,8 @@ if [ $OS_PLATFORM = "Windows_95" ] || [ $OS_PLATFORM =
>- else
>- 	for prog in $TESTS
>- 	do
>--		printf "$prog"
>--		printf "\nBEGIN TEST: $prog\n\n" >> ${LOGFILE} 2>&1
>--		export test_rval
>--		./$prog >> ${LOGFILE} 2>&1 &
>-+		printf %16s $prog
>-+		./$prog >> $prog.output 2>&1 &
>- 		test_pid=$!
>- 		sleep_pid=0
>- 		if test -n "$TEST_TIMEOUT" && test "$TEST_TIMEOUT" -gt 0
>-@@ -243,28 +240,11 @@ else
>- 			printf "\t\t\tPassed\n";
>- 		else
>- 			printf "\t\t\tFAILED\n";
>-+			sed "s,^,	$prog:	," < $prog.output
>- 			rval=1
>- 		fi;
>--		printf "\nEND TEST: $prog\n\n" >> ${LOGFILE} 2>&1
>- 	done
>- fi;
>- 
>- printf "END\t\t\t`date`\n"
>- exit $rval
> -
> -
> -
>@@ -1131,7 +1052,6 @@
> -
> -
> -
>--
> --- pr/tests/sel_spd.c.orig	2019-08-19 14:12:12 UTC
> +++ pr/tests/sel_spd.c
> @@ -15,23 +15,26 @@
>@@ -1883,26 +1803,6 @@
>  	PR_smprintf_free(s);
>  	exit(-1);
>      }
>---- pr/tests/stack.c.orig	2019-08-19 14:12:12 UTC
>-+++ pr/tests/stack.c
>-@@ -54,7 +54,7 @@ PRFileDesc  *errhandle;
>- int main(int argc, char **argv)
>- {
>- #if defined(__WINS__))
>--    PRInt32 rv, cnt, sum;
>-+    PRInt32 cnt, sum;
>- 	DataRecord	*Item;
>- 	PRStack		*list1, *list2;
>- 	PRStackElem	*node;
>-@@ -209,7 +209,7 @@ int main(int argc, char **argv)
>- static void stackop(void *thread_arg)
>- {
>-     PRInt32 val, cnt, index, loops;
>--	DataRecord	*Items, *Item;
>-+	DataRecord	*Items;
>- 	PRStack		*list1, *list2;
>- 	PRStackElem	*node;
>- 	stack_data *arg = (stack_data *) thread_arg;
> --- pr/tests/suspend.c.orig	2019-08-19 14:12:12 UTC
> +++ pr/tests/suspend.c
> @@ -21,14 +21,14 @@ void PR_CALLBACK

Actions: View | Diff

Attachments on bug 239986: 206722 | 206723 | 206724 | 206784