3 files changed, 9 insertions, 2 deletions
diff --git a/pr/tests/runtests.ksh b/pr/tests/runtests.ksh
index 19c628f4..6c64cb4a 100755
--- a/pr/tests/runtests.ksh
+++ b/pr/tests/runtests.ksh
@@ -39,7 +39,7 @@
 
 SYSTEM_INFO=`uname -a`
 OS_ARCH=`uname -s`
-if [ $OS_ARCH = "Windows_NT" ]
+if [ $OS_ARCH = "Windows_NT" ] || [ $OS_ARCH = "OS/2" ]
 then
 	NULL_DEVICE=nul
 else
diff --git a/pr/tests/runtests.sh b/pr/tests/runtests.sh
index 4ce755cb..959b5d50 100755
--- a/pr/tests/runtests.sh
+++ b/pr/tests/runtests.sh
@@ -39,7 +39,7 @@
 
 SYSTEM_INFO=`uname -a`
 OS_ARCH=`uname -s`
-if [ $OS_ARCH = "Windows_NT" ]
+if [ $OS_ARCH = "Windows_NT" ] || [ $OS_ARCH = "OS/2" ]
 then
 	NULL_DEVICE=nul
 else
diff --git a/pr/tests/thrpool_server.c b/pr/tests/thrpool_server.c
index df56560e..e10dd5bd 100644
--- a/pr/tests/thrpool_server.c
+++ b/pr/tests/thrpool_server.c
@@ -54,6 +54,13 @@
 #include <pthread.h>
 #endif
 
+/* for getcwd */
+#if defined(XP_UNIX) || defined (XP_OS2_EMX) || defined(XP_BEOS)
+#include <unistd.h>
+#elif defined(XP_PC)
+#include <direct.h>
+#endif
+
 #ifdef WIN32
 #include <process.h>
 #endif