Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 23 Aug 2019 21:55:41 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r509663 - head/devel/nspr/files
Message-ID:  <201908232155.x7NLtfmp099323@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Fri Aug 23 21:55:41 2019
New Revision: 509663
URL: https://svnweb.freebsd.org/changeset/ports/509663

Log:
  devel/nspr: unbreak TEST=on build after r509330
  
  attach.c:170:2: error: unterminated conditional directive
   #ifdef _PR_PTHREADS
    ^
  attach.c:275:2: error: expected '}'
  }
   ^
  attach.c:109:1: note: to match this '{'
  {
  ^
  attach.c:176:8: error: use of undeclared label 'exit_now'
                  goto exit_now;
                       ^
  
  PR:		239986
  Reported by:	Ross McKelvie

Added:
  head/devel/nspr/files/patch-bug1575821   (contents, props changed)
Modified:
  head/devel/nspr/files/patch-tests   (contents, props changed)

Added: head/devel/nspr/files/patch-bug1575821
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/nspr/files/patch-bug1575821	Fri Aug 23 21:55:41 2019	(r509663)
@@ -0,0 +1,58 @@
+Unbreak building tests after obsolete platform removals.
+
+--- pr/tests/attach.c.orig	2019-08-19 14:12:12 UTC
++++ pr/tests/attach.c
+@@ -259,6 +259,7 @@ int main(int argc, char **argv)
+         goto exit_now;
+     }
+ 
++#else
+ 	if (!debug_mode)
+ 		failed_already=1;
+ 	else	
+@@ -266,6 +267,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)	
+--- pr/tests/nonblock.c.orig	2019-08-19 14:12:12 UTC
++++ pr/tests/nonblock.c
+@@ -23,6 +23,7 @@
+ ** Make win16 unit_time interval 300 milliseconds, others get 100
+ */
+ #define UNIT_TIME  200       /* unit time in milliseconds */
++#else
+ #define UNIT_TIME  100       /* unit time in milliseconds */
+ #endif
+ #define CHUNK_SIZE 10
+--- pr/tests/stack.c.orig	2019-08-19 14:12:12 UTC
++++ pr/tests/stack.c
+@@ -53,7 +53,6 @@ PRFileDesc  *errhandle;
+ 
+ int main(int argc, char **argv)
+ {
+-#if defined(__WINS__))
+     PRInt32 rv, cnt, sum;
+ 	DataRecord	*Item;
+ 	PRStack		*list1, *list2;
+@@ -203,7 +202,6 @@ int main(int argc, char **argv)
+ 								SUM_OF_NUMBERS(data_cnt * thread_cnt));
+ 		return 2;
+ 	}
+-#endif
+ }
+ 
+ static void stackop(void *thread_arg)
+--- pr/tests/testfile.c.orig	2019-08-19 14:12:12 UTC
++++ pr/tests/testfile.c
+@@ -72,7 +72,6 @@ char *FILE_NAME = "pr_testfile";
+ char *HIDDEN_FILE_NAME = "hidden_pr_testfile";
+ #else
+ char *TEST_DIR = "/tmp/testfile_dir";
+-#endif
+ char *FILE_NAME = "pr_testfile";
+ char *HIDDEN_FILE_NAME = ".hidden_pr_testfile";
+ #endif

Modified: head/devel/nspr/files/patch-tests
==============================================================================
--- head/devel/nspr/files/patch-tests	Fri Aug 23 21:55:31 2019	(r509662)
+++ head/devel/nspr/files/patch-tests	Fri Aug 23 21:55:41 2019	(r509663)
@@ -1885,16 +1885,16 @@
      }
 --- pr/tests/stack.c.orig	2019-08-19 14:12:12 UTC
 +++ pr/tests/stack.c
-@@ -54,7 +54,7 @@ PRFileDesc  *errhandle;
+@@ -53,7 +53,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)
+@@ -207,7 +207,7 @@ int main(int argc, char **argv)
  static void stackop(void *thread_arg)
  {
      PRInt32 val, cnt, index, loops;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908232155.x7NLtfmp099323>