summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-08-22 12:16:16 +0000
committerJan Beich <jbeich@FreeBSD.org>2019-08-22 12:16:16 +0000
commitbd4448ee1d97d90adb236a6342bfc7121a3edc15 (patch)
tree47b9b3e436192b76108f6adb8b4450e784004d56
parent4d7b16583f606b291f7767a5f50cf2e472d3f4cf (diff)
downloadnspr-hg-bd4448ee1d97d90adb236a6342bfc7121a3edc15.tar.gz
Bug 1575821 - Unbreak building tests after bug 1535665. r=kaie
-rw-r--r--pr/tests/attach.c2
-rw-r--r--pr/tests/nonblock.c1
-rw-r--r--pr/tests/stack.c2
-rw-r--r--pr/tests/testfile.c1
4 files changed, 3 insertions, 3 deletions
diff --git a/pr/tests/attach.c b/pr/tests/attach.c
index 5b914487..0b935fff 100644
--- a/pr/tests/attach.c
+++ b/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)
diff --git a/pr/tests/nonblock.c b/pr/tests/nonblock.c
index 30f3e7d3..ed447a2c 100644
--- a/pr/tests/nonblock.c
+++ b/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
diff --git a/pr/tests/stack.c b/pr/tests/stack.c
index e294701a..c09bf4a2 100644
--- a/pr/tests/stack.c
+++ b/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)
diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c
index 5bc8e2f9..8a89b92f 100644
--- a/pr/tests/testfile.c
+++ b/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