This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Valid tear-down pids.
- From: cagney at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 11 Mar 2008 19:23:19 -0000
- Subject: [SCM] master: Valid tear-down pids.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via 537514afa8afe63a15d3a06d916b6c6bc3160881 (commit)
from 43df9a4df62a43b27be1b15451df67d42e37f896 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 537514afa8afe63a15d3a06d916b6c6bc3160881
Author: Andrew Cagney <cagney@redhat.com>
Date: Tue Mar 11 15:22:08 2008 -0400
Valid tear-down pids.
frysk-sys/frysk/testbed/ChangeLog
2008-03-11 Andrew Cagney <cagney@redhat.com>
* TestTearDownProcess.java (testInvalidPid()): New.
(testInitPid()): New.
* TearDownProcess.java (add(ProcessIdentifier)): Validate PID.
-----------------------------------------------------------------------
Summary of changes:
frysk-sys/frysk/testbed/ChangeLog | 6 ++++++
frysk-sys/frysk/testbed/TearDownProcess.java | 4 +++-
frysk-sys/frysk/testbed/TestTearDownProcess.java | 19 +++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletions(-)
First 500 lines of diff:
diff --git a/frysk-sys/frysk/testbed/ChangeLog b/frysk-sys/frysk/testbed/ChangeLog
index 6e0a8f6..e461a0c 100644
--- a/frysk-sys/frysk/testbed/ChangeLog
+++ b/frysk-sys/frysk/testbed/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-11 Andrew Cagney <cagney@redhat.com>
+
+ * TestTearDownProcess.java (testInvalidPid()): New.
+ (testInitPid()): New.
+ * TearDownProcess.java (add(ProcessIdentifier)): Validate PID.
+
2008-02-13 Andrew Cagney <cagney@redhat.com>
* TearDownProcess.java: Update to match frysk.sys.Wait.
diff --git a/frysk-sys/frysk/testbed/TearDownProcess.java b/frysk-sys/frysk/testbed/TearDownProcess.java
index f74104e..f13d1d6 100644
--- a/frysk-sys/frysk/testbed/TearDownProcess.java
+++ b/frysk-sys/frysk/testbed/TearDownProcess.java
@@ -76,7 +76,9 @@ public class TearDownProcess {
fine.log("add", pid);
// Had better not try to register process one.
if (pid.intValue() == 1)
- throw new RuntimeException("killing process one during teardown");
+ throw new RuntimeException("teardown init process: " + pid);
+ if (pid.intValue() <= 0)
+ throw new RuntimeException("teardown process invalid: " + pid);
pidsToKillDuringTearDown.add(pid);
}
diff --git a/frysk-sys/frysk/testbed/TestTearDownProcess.java b/frysk-sys/frysk/testbed/TestTearDownProcess.java
index c6104fb..f713305 100644
--- a/frysk-sys/frysk/testbed/TestTearDownProcess.java
+++ b/frysk-sys/frysk/testbed/TestTearDownProcess.java
@@ -47,6 +47,7 @@ import frysk.sys.Signal;
import frysk.sys.UnhandledWaitBuilder;
import frysk.sys.SignalBuilder;
import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
public class TestTearDownProcess
extends TestCase
@@ -68,6 +69,24 @@ public class TestTearDownProcess
assertGone(pid);
}
+ public void testInvalidPid() {
+ ProcessIdentifier zero = ProcessIdentifierFactory.create(0);
+ try {
+ TearDownProcess.add(zero);
+ fail("add of zero should not succeed");
+ } catch (RuntimeException e) {
+ }
+ }
+
+ public void testInitPid() {
+ ProcessIdentifier init = ProcessIdentifierFactory.create(1);
+ try {
+ TearDownProcess.add(init);
+ fail("add of init should not succeed");
+ } catch (RuntimeException e) {
+ }
+ }
+
public void testForkPtraceAttached() {
ProcessIdentifier pid = Fork.ptrace(new String[] { "/bin/true" });
long maxTime = System.currentTimeMillis() + getTimeoutMilliseconds();
hooks/post-receive
--
frysk system monitor/debugger