On Sun, 12 Nov 2006, Antoine Jacoutot wrote:
- adds arm support (from kili@)
- enables nameshm1 regression test (but ClientServerTest is deactivated)
Again, new diff to merge kili's changes so that the prpollml regression
test does not run out of file descriptors.
ok?
--
Antoine
diff -x CVS -rNu ../nspr.orig/Makefile ./Makefile
--- ../nspr.orig/Makefile Fri Nov 10 22:44:24 2006
+++ ./Makefile Sun Nov 12 13:19:14 2006
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2006/11/10 16:01:29 ajacoutot Exp $
# $FreeBSD: /repoman/r/pcvs/ports/devel/nspr/Makefile,v 1.13 2003/12/13
21:30:19 peter Exp $
-ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
+ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
COMMENT= "Netscape Portable Runtime"
COMMENT-docs= "HTML Documentation for NSPR"
@@ -75,7 +75,7 @@
do-regress:
${MAKE_PROGRAM} -C ${WRKSRC}/pr/tests
${MAKE_PROGRAM} -C ${WRKSRC}/lib/tests
- @cd ${WRKSRC}/pr/tests && /bin/ksh runtests.ksh
+ @cd ${WRKSRC}/pr/tests && ulimit -n 128 && /bin/ksh runtests.ksh
LD_LIBRARY_PATH=${WRKSRC}/dist/lib/ ${WRKSRC}/lib/tests/string
LD_LIBRARY_PATH=${WRKSRC}/dist/lib/ ${WRKSRC}/lib/tests/base64t
diff -x CVS -rNu
../nspr.orig/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg
./patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg
--- ../nspr.orig/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg
Thu Jan 1 01:00:00 1970
+++ ./patches/patch-mozilla_nsprpub_pr_include_md__openbsd_cfg Sun Nov 12
13:15:38 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- mozilla/nsprpub/pr/include/md/_openbsd.cfg.orig Sun Apr 25 17:00:47 2004
++++ mozilla/nsprpub/pr/include/md/_openbsd.cfg Fri Nov 10 21:48:56 2006
+@@ -48,7 +48,7 @@
+
+ #define PR_AF_INET6 24 /* same as AF_INET6 */
+
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__arm__)
+
+ #define IS_LITTLE_ENDIAN 1
+ #undef IS_BIG_ENDIAN
diff -x CVS -rNu
../nspr.orig/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
./patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h
--- ../nspr.orig/patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h Fri Nov
10 22:44:24 2006
+++ ./patches/patch-mozilla_nsprpub_pr_include_md__openbsd_h Sun Nov 12
13:15:38 2006
@@ -1,8 +1,12 @@
$OpenBSD: patch-mozilla_nsprpub_pr_include_md__openbsd_h,v 1.2 2006/11/06
14:35:45 ajacoutot Exp $
--- mozilla/nsprpub/pr/include/md/_openbsd.h.orig Sun Apr 25 17:00:47 2004
-+++ mozilla/nsprpub/pr/include/md/_openbsd.h Sat Nov 4 13:14:54 2006
-@@ -56,7 +56,7 @@
++++ mozilla/nsprpub/pr/include/md/_openbsd.h Fri Nov 10 20:13:55 2006
+@@ -54,9 +54,11 @@
+ #define _PR_SI_ARCHITECTURE "powerpc"
+ #elif defined(__sparc__)
#define _PR_SI_ARCHITECTURE "sparc"
++#elif defined(__arm__)
++#define _PR_SI_ARCHITECTURE "arm"
#endif
-#define PR_DLL_SUFFIX ".so.1.0"
@@ -10,3 +14,12 @@
#define _PR_VMBASE 0x30000000
#define _PR_STACK_VMBASE 0x50000000
+@@ -97,6 +99,8 @@
+ #define JB_SP_INDEX 34
+ #elif defined(__amd64__)
+ #define JB_SP_INDEX 6
++#elif defined(__arm__)
++#define JB_SP_INDEX 23
+ #else
+ #error "Need to define SP index in jmp_buf here"
+ #endif
diff -x CVS -rNu ../nspr.orig/patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c
./patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c
--- ../nspr.orig/patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c Thu Jan
1 01:00:00 1970
+++ ./patches/patch-mozilla_nsprpub_pr_tests_nameshm1_c Sun Nov 12 13:15:38 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- mozilla/nsprpub/pr/tests/nameshm1.c.orig Sun Nov 12 12:25:58 2006
++++ mozilla/nsprpub/pr/tests/nameshm1.c Sun Nov 12 12:26:27 2006
+@@ -589,7 +589,7 @@ PRIntn main(PRIntn argc, char *argv[])
+ ReadOnlyTest();
+ if ( failed_already != 0 )
+ goto Finished;
+- ClientServerTest();
++/* ClientServerTest(); */
+ }
+
+ Finished:
diff -x CVS -rNu ../nspr.orig/patches/patch-mozilla_nsprpub_pr_tests_prpollml_c
./patches/patch-mozilla_nsprpub_pr_tests_prpollml_c
--- ../nspr.orig/patches/patch-mozilla_nsprpub_pr_tests_prpollml_c Thu Jan
1 01:00:00 1970
+++ ./patches/patch-mozilla_nsprpub_pr_tests_prpollml_c Sun Nov 12 13:18:35 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- mozilla/nsprpub/pr/tests/prpollml.c.orig Sun Apr 25 17:01:02 2004
++++ mozilla/nsprpub/pr/tests/prpollml.c Sun Nov 12 13:18:20 2006
+@@ -47,7 +47,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#define POLL_DESC_COUNT 256 /* This should be greater than the
++#define POLL_DESC_COUNT 120 /* This should be greater than the
+ * STACK_POLL_DESC_COUNT macro in
+ * ptio.c to cause syspoll_list to
+ * be created. */
diff -x CVS -rNu
../nspr.orig/patches/patch-mozilla_nsprpub_pr_tests_runtests_ksh
./patches/patch-mozilla_nsprpub_pr_tests_runtests_ksh
--- ../nspr.orig/patches/patch-mozilla_nsprpub_pr_tests_runtests_ksh Fri Nov
10 10:55:36 2006
+++ ./patches/patch-mozilla_nsprpub_pr_tests_runtests_ksh Sun Nov 12
13:15:38 2006
@@ -1,18 +1,18 @@
$OpenBSD: patch-mozilla_nsprpub_pr_tests_runtests_ksh,v 1.2 2006/11/09
19:00:39 ajacoutot Exp $
--- mozilla/nsprpub/pr/tests/runtests.ksh.orig Sun Apr 25 17:01:02 2004
-+++ mozilla/nsprpub/pr/tests/runtests.ksh Thu Nov 9 10:27:17 2006
++++ mozilla/nsprpub/pr/tests/runtests.ksh Sun Nov 12 12:41:24 2006
@@ -84,10 +84,12 @@ fi
# Tests not run (but should)
#
-#forktest (failed on IRIX)
-+#nameshm1 - timeout
++#nameshm1 - runs but ClientServerTest is deactivated
#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
-+#sema - timeout
-+#semaerr - timeout
-+#semaping - timeout
++#sema - idles forever
++#semaerr - idles forever
++#semaping - idles forever
#sleep - specific to OS/2
LOGFILE=${NSPR_TEST_LOGFILE:-$NULL_DEVICE}
@@ -24,15 +24,7 @@
formattm
fsync
gethost
-@@ -144,7 +147,6 @@ lockfile
- logger
- many_cv
- multiwait
--nameshm1
- nblayer
- nonblock
- ntioto
-@@ -160,6 +162,7 @@ perf
+@@ -160,6 +163,7 @@ perf
pipeping
pipeping2
pipeself
@@ -40,7 +32,7 @@
poll_nm
poll_to
pollable
-@@ -175,9 +178,6 @@ selct_er
+@@ -175,9 +179,6 @@ selct_er
selct_nm
selct_to
selintr
@@ -50,7 +42,7 @@
sendzlf
server_test
servr_kk
-@@ -250,7 +250,7 @@ else
+@@ -250,7 +251,7 @@ else
echo "$prog\c"
echo "\nBEGIN TEST: $prog\n" >> ${LOGFILE} 2>&1
export test_rval
