summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/tests/Signal_Test.cpp10
2 files changed, 12 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index de06b03e493..fd46b52ce53 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 23 14:40:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Signal_Test.cpp:
+ Use ACE_ERROR_RETURN instead of ACE_ASSERT which causes a VxWorks
+ target to hang
+
Tue Oct 23 14:10:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/run_test.lst:
diff --git a/ACE/tests/Signal_Test.cpp b/ACE/tests/Signal_Test.cpp
index 5a6cb5185f8..ffde5f12eec 100644
--- a/ACE/tests/Signal_Test.cpp
+++ b/ACE/tests/Signal_Test.cpp
@@ -291,11 +291,13 @@ worker_parent (void *arg)
ACE_Process pm;
child_pid = pm.spawn (options);
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("(%P|%t) spawning child process %d\n"),
- child_pid));
- ACE_ASSERT (child_pid != -1);
+ if (child_pid == ACE_INVALID_PID)
+ ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) spawning child process failed\n"), -1);
+ else
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%P|%t) spawning child process %d\n"),
+ child_pid));
// Perform a <wait> until our child process has exited.