public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: Rename -trace to -debug.
@ 2008-02-11 18:57 cagney
0 siblings, 0 replies; only message in thread
From: cagney @ 2008-02-11 18:57 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via 9217bc52ea47dd010f68d87426a70b491cbf4689 (commit)
via 04d5324b576d065465589f5df9561ba44c636bbe (commit)
via dcaae638b17d33df7cb11786af90ebee8e5c4f39 (commit)
via 52ea2d817b200b29805ce44c6470f96c910f1f1d (commit)
via 90e8b07f3a2652c9377ae21eb4216f953328c0fd (commit)
via f6888c38c23238fb73059246e1f38bedfc3659ed (commit)
via 793a0f19ca2563ab43609ae06ec9f539d6cd2aeb (commit)
via 45b3a558792877f50b7a1af5e7c3d9c8c1fd33fa (commit)
via d33b2efaa66c77ba01bc6e7bb089a06f7ed68a3e (commit)
from 7cd0b6627235a9e66fe836693d83dc496a5c7a89 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 9217bc52ea47dd010f68d87426a70b491cbf4689
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 13:52:51 2008 -0500
Rename -trace to -debug.
frysk-sys/frysk/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* EventLogger.java: Rename LogOption to "debug".
commit 04d5324b576d065465589f5df9561ba44c636bbe
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 13:30:44 2008 -0500
Remove java.util.logging from inua.
frysk-sys/inua/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* eio/ByteBuffer.java: Remove java.util.logging.
commit dcaae638b17d33df7cb11786af90ebee8e5c4f39
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 13:25:18 2008 -0500
Zap dead #include.
frysk-sys/frysk/sys/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* cni/Errno.hxx: Delete unnecessary #include
<java/util/logging/Logger.h>
commit 52ea2d817b200b29805ce44c6470f96c910f1f1d
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 13:22:58 2008 -0500
Delete dead log code from Errno.hxx/cxx.
frysk-sys/frysk/sys/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* cni/Errno.hxx (logMessage(Logger,Level,char*,...)): Delete.
(jLogMessage(Object,Logger,Level,char*,...)): Delete.
(logFine(Object,Logger,char*,...)): Delete.
(logFinest(Object,Logger,char*,...)): Delete.
(jLogFine(Object,Logger,char*,...)): Delete.
(jLogFinest(Object,Logger,char*,...)): Delete.
* cni/Errno.cxx: Update.
commit 90e8b07f3a2652c9377ae21eb4216f953328c0fd
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 13:13:35 2008 -0500
Use frysk.rsl in frysk.sys tests and junit's Results class.
frysk-sys/frysk/junit/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* Results.java: Use frysk.rsl.
frysk-sys/frysk/rsl/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* Log.java (log(String,Object,String,Object,String,Object,String,Object)): New.
(log(String,int)): New.
(log(String,long)): New.
frysk-sys/frysk/sys/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* TestPipePair.java: Use frysk.rsl.
* TestFork.java: Ditto.
commit f6888c38c23238fb73059246e1f38bedfc3659ed
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 12:53:49 2008 -0500
Use frysk.rsl in lib.unwind.
frysk-sys/frysk/rsl/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* cni/Log.hxx (log(Log,Object,const char*,Object))
(log(Log,const char *,Object)): New.
(log(Log,const char *)): New.
(log(Log,Object,const char *)): New.
* cni/Log.cxx: Update.
frysk-sys/lib/unwind/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* Unwind.java: Use frysk.rsl.
* Cursor.java: Ditto.
* cni/UnwindH.hxx: Ditto.
commit 793a0f19ca2563ab43609ae06ec9f539d6cd2aeb
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 12:25:29 2008 -0500
Use frysk.rsl in frysk.sys.termios.
frysk-sys/frysk/sys/termios/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* TestMode.java: Use frysk.rsl.
* TestSpecial.java: Ditto.
* TestSpeed.java: Ditto.
* TestLib.java: Ditto.
commit 45b3a558792877f50b7a1af5e7c3d9c8c1fd33fa
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 12:12:03 2008 -0500
Fix frysk.sys.TestWait.testShortTimeout comparison test.
frysk-sys/frysk/sys/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* TestWait.java (testShortTimeout()): Fix comparison test.
(setUp(), tearDown()): Simplify timeout computation.
commit d33b2efaa66c77ba01bc6e7bb089a06f7ed68a3e
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Feb 11 12:04:44 2008 -0500
Use frysk.rsl in frysk.sys.Wait.
frysk-sys/frysk/rsl/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* Log.java (prefixTime()): Replace prePrefix().
(prefix(), prefix(Object)): Use.
* cni/Log.hxx: New file.
* cni/Log.cxx: New file.
frysk-sys/frysk/sys/ChangeLog
2008-02-11 Andrew Cagney <cagney@redhat.com>
* Wait.java: Use frysk.rsl.
* cni/Wait.cxx: Ditto.
-----------------------------------------------------------------------
Summary of changes:
frysk-sys/frysk/ChangeLog | 4 +
frysk-sys/frysk/EventLogger.java | 4 +-
frysk-sys/frysk/junit/ChangeLog | 5 +
frysk-sys/frysk/junit/Results.java | 28 ++---
frysk-sys/frysk/rsl/ChangeLog | 17 +++
frysk-sys/frysk/rsl/Log.java | 24 +++-
.../frysk/{sys/cni/Itimer.cxx => rsl/cni/Log.cxx} | 74 ++++++-----
.../frysk/rsl/cni/Log.hxx | 24 +---
frysk-sys/frysk/sys/ChangeLog | 22 +++
frysk-sys/frysk/sys/TestFork.java | 22 ++--
frysk-sys/frysk/sys/TestPipePair.java | 26 ++--
frysk-sys/frysk/sys/TestWait.java | 23 ++--
frysk-sys/frysk/sys/Wait.java | 24 +++-
frysk-sys/frysk/sys/cni/Errno.cxx | 136 --------------------
frysk-sys/frysk/sys/cni/Errno.hxx | 29 ----
frysk-sys/frysk/sys/cni/Wait.cxx | 53 ++++-----
frysk-sys/frysk/sys/termios/ChangeLog | 7 +
frysk-sys/frysk/sys/termios/TestLib.java | 38 +++---
frysk-sys/frysk/sys/termios/TestMode.java | 32 ++---
frysk-sys/frysk/sys/termios/TestSpecial.java | 32 ++---
frysk-sys/frysk/sys/termios/TestSpeed.java | 55 ++++-----
frysk-sys/inua/ChangeLog | 4 +
frysk-sys/inua/eio/ByteBuffer.java | 22 ---
frysk-sys/lib/unwind/ChangeLog | 6 +
frysk-sys/lib/unwind/Cursor.java | 19 ++--
frysk-sys/lib/unwind/Unwind.java | 10 +-
frysk-sys/lib/unwind/cni/UnwindH.hxx | 54 ++++----
27 files changed, 330 insertions(+), 464 deletions(-)
copy frysk-sys/frysk/{sys/cni/Itimer.cxx => rsl/cni/Log.cxx} (65%)
copy frysk-core/frysk/debuginfo/CompilerVersion.java => frysk-sys/frysk/rsl/cni/Log.hxx (82%)
First 500 lines of diff:
diff --git a/frysk-sys/frysk/ChangeLog b/frysk-sys/frysk/ChangeLog
index ae456df..5ce808c 100644
--- a/frysk-sys/frysk/ChangeLog
+++ b/frysk-sys/frysk/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-11 Andrew Cagney <cagney@redhat.com>
+
+ * EventLogger.java: Rename LogOption to "debug".
+
2008-02-07 Andrew Cagney <cagney@redhat.com>
* ForkFactory.java: New.
diff --git a/frysk-sys/frysk/EventLogger.java b/frysk-sys/frysk/EventLogger.java
index 16e34f6..10456d0 100644
--- a/frysk-sys/frysk/EventLogger.java
+++ b/frysk-sys/frysk/EventLogger.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2005, Red Hat Inc.
+// Copyright 2005, 2006, 2007, 2008, Red Hat Inc.
//
// FRYSK is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
@@ -232,6 +232,6 @@ public class EventLogger
verbose = true;
}
});
- parser.add(new LogOption("trace"));
+ parser.add(new LogOption("debug"));
}
}
diff --git a/frysk-sys/frysk/junit/ChangeLog b/frysk-sys/frysk/junit/ChangeLog
index 9c12bd3..203f138 100644
--- a/frysk-sys/frysk/junit/ChangeLog
+++ b/frysk-sys/frysk/junit/ChangeLog
@@ -1,4 +1,9 @@
+2008-02-11 Andrew Cagney <cagney@redhat.com>
+
+ * Results.java: Use frysk.rsl.
+
2008-01-04 Nurdin Premji <npremji@redhat.com>
+
* TestCase.java (unresolvedCompilerNoSupportForAT_CLASS): New.
2007-12-28 Andrew Cagney <cagney@redhat.com>
diff --git a/frysk-sys/frysk/junit/Results.java b/frysk-sys/frysk/junit/Results.java
index 7d3685b..5a0de0e 100644
--- a/frysk-sys/frysk/junit/Results.java
+++ b/frysk-sys/frysk/junit/Results.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2005, 2006, 2007, Red Hat Inc.
+// Copyright 2005, 2006, 2007, 2008, Red Hat Inc.
//
// FRYSK is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
@@ -40,8 +40,6 @@
package frysk.junit;
import java.io.PrintStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import junit.framework.AssertionFailedError;
import junit.framework.Test;
import junit.textui.ResultPrinter;
@@ -49,35 +47,32 @@ import junit.framework.TestResult;
import java.util.Set;
import java.util.TreeSet;
import java.util.Iterator;
+import frysk.rsl.Log;
/**
* Overide JUnit's print methods with a version that displays each
* test as it is run. Makes tracking down problems when the run does
* a crash 'n' burn easier.
*/
-class Results
- extends ResultPrinter
-{
- private static final Logger logger = Logger.getLogger("frysk");
+class Results extends ResultPrinter {
+ private static final Log fine = Log.fine(Results.class);
private static Result result;
private static final Set unresolved = new TreeSet();
private static final Set resolved = new TreeSet();
private static final Set unsupported = new TreeSet();
- public void startTest (Test test)
- {
- logger.log (Level.FINE, "{0} ---- startTest ----\n", test);
+ public void startTest(Test test) {
+ fine.log("---- startTest ----", test);
System.out.print ("Running ");
System.out.print (test);
System.out.print (" ...");
System.out.flush ();
result = Result.PASS;
}
- private void addProblem (Test test, String name, String what, Throwable t)
- {
- logger.log (Level.FINE, "{0} --- {1} ---- {2}: {3}\n",
- new Object[] { test, name, what, t });
+ private void addProblem(Test test, String name, String what, Throwable t) {
+ fine.log("---- addProblem ----", test, "---", name, "---", what,
+ ":", t);
// If a problem was previously recorded, move it to the
// unresolved set.
if (result != Result.PASS) {
@@ -111,9 +106,8 @@ class Results
result = Result.unsupported (reason);
unsupported.add(result);
}
- public void endTest (Test test)
- {
- logger.log (Level.FINE, "{0} ---- endTest ----\n", test);
+ public void endTest(Test test) {
+ fine.log("---- endTest ----", test);
result.println();
}
diff --git a/frysk-sys/frysk/rsl/ChangeLog b/frysk-sys/frysk/rsl/ChangeLog
index 773cd80..e87d3ac 100644
--- a/frysk-sys/frysk/rsl/ChangeLog
+++ b/frysk-sys/frysk/rsl/ChangeLog
@@ -1,3 +1,20 @@
+2008-02-11 Andrew Cagney <cagney@redhat.com>
+
+ * Log.java (log(String,Object,String,Object,String,Object,String,Object)): New.
+ (log(String,int)): New.
+ (log(String,long)): New.
+
+ * cni/Log.hxx (log(Log,Object,const char*,Object))
+ (log(Log,const char *,Object)): New.
+ (log(Log,const char *)): New.
+ (log(Log,Object,const char *)): New.
+ * cni/Log.cxx: Update.
+
+ * Log.java (prefixTime()): Replace prePrefix().
+ (prefix(), prefix(Object)): Use.
+ * cni/Log.hxx: New file.
+ * cni/Log.cxx: New file.
+
2008-02-10 Andrew Cagney <cagney@redhat.com>
* Node.java: Delete stray printlns.
diff --git a/frysk-sys/frysk/rsl/Log.java b/frysk-sys/frysk/rsl/Log.java
index d2435f4..8e7cf96 100644
--- a/frysk-sys/frysk/rsl/Log.java
+++ b/frysk-sys/frysk/rsl/Log.java
@@ -121,23 +121,22 @@ public final class Log {
private static final long startTime = System.currentTimeMillis();
- private void prePrefix() {
+ private void prefixTime() {
long time = System.currentTimeMillis() - startTime;
out.print(time / 1000);
out.print(".");
out.print(time % 1000);
out.print(": ");
- out.print(path);
- out.print(":");
}
private void prefix() {
- prePrefix();
+ prefixTime();
+ out.print(path);
out.print(":");
}
private void prefix(Object o) {
- prePrefix();
+ prefixTime();
out.print(" [");
out.print(o.toString());
out.print("]:");
@@ -307,6 +306,16 @@ public final class Log {
return;
prefix(); print(p1); print(p2); suffix();
}
+ public void log(String p1, int p2) {
+ if (!logging)
+ return;
+ prefix(); print(p1); print(p2); suffix();
+ }
+ public void log(String p1, long p2) {
+ if (!logging)
+ return;
+ prefix(); print(p1); print(p2); suffix();
+ }
public void log(String p1, char[] p2) {
if (!logging)
return;
@@ -337,6 +346,11 @@ public final class Log {
return;
prefix(); print(p1); print(p2); print(p3); print(p4); suffix();
}
+ public void log(String p1, Object p2, String p3, Object p4, String p5, Object p6, String p7, Object p8) {
+ if (!logging)
+ return;
+ prefix(); print(p1); print(p2); print(p3); print(p4); print(p5); print(p6); print(p7); print(p8); suffix();
+ }
// Non-static log methods; first parameter is the object.
public void log(Object self, String p1) {
diff --git a/frysk-sys/frysk/sys/cni/Itimer.cxx b/frysk-sys/frysk/rsl/cni/Log.cxx
similarity index 65%
copy from frysk-sys/frysk/sys/cni/Itimer.cxx
copy to frysk-sys/frysk/rsl/cni/Log.cxx
index 4b9b70f..c7e2f8f 100644
--- a/frysk-sys/frysk/sys/cni/Itimer.cxx
+++ b/frysk-sys/frysk/rsl/cni/Log.cxx
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2005, 2007, Red Hat Inc.
+// Copyright 2008, Red Hat Inc.
//
// FRYSK is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
@@ -37,47 +37,59 @@
// version and license this file solely under the GPL without
// exception.
-#include <signal.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <unistd.h>
+#include <stdarg.h>
#include <gcj/cni.h>
-#include "frysk/sys/Itimer.h"
-#include "frysk/sys/Signal.h"
+#include "frysk/rsl/Log.h"
#include "frysk/sys/cni/Errno.hxx"
-struct timeval
-timeval (jlong milliseconds)
-{
- struct timeval val;
- val.tv_sec = milliseconds / 1000;
- val.tv_usec = (milliseconds % 1000) * 1000;
- return val;
+void
+logf(frysk::rsl::Log* logger, const char* format, ...) {
+ if (!logger->logging())
+ return;
+ va_list ap;
+ va_start(ap, format);
+ jstring message = vajprintf(format, ap);
+ logger->log(message);
+ va_end(ap);
+}
+
+void
+logf(frysk::rsl::Log* logger, jobject object, const char* format, ...) {
+ if (!logger->logging())
+ return;
+ va_list ap;
+ va_start(ap, format);
+ jstring message = vajprintf(format, ap);
+ logger->log(object, message);
+ va_end(ap);
}
+void
+log(frysk::rsl::Log* logger, jobject self, const char* p1, jobject p2) {
+ if (!logger->logging())
+ return;
+ logger->log(self, JvNewStringUTF(p1), p2);
+}
void
-setItimer (int which, jlong interval, jlong value)
-{
- struct itimerval itimer;
- itimer.it_interval = timeval (interval);
- itimer.it_value = timeval (value);
- errno = 0;
- if (::setitimer (which, &itimer, NULL) < 0)
- throwErrno (errno, "setitimer");
+log(frysk::rsl::Log* logger, const char* p1, jobject p2) {
+ if (!logger->logging())
+ return;
+ logger->log(JvNewStringUTF(p1), p2);
}
-frysk::sys::Signal*
-frysk::sys::Itimer::real (jlong interval, jlong value)
-{
- setItimer (ITIMER_REAL, interval, value);
- return frysk::sys::Signal::ALRM;
+void
+log(frysk::rsl::Log* logger, jobject self, const char* p1) {
+ if (!logger->logging())
+ return;
+ logger->log(self, JvNewStringUTF(p1));
}
-jint
-frysk::sys::Itimer::sleep (jint seconds)
-{
- return ::sleep (seconds);
+void
+log(frysk::rsl::Log* logger, const char* p1) {
+ if (!logger->logging())
+ return;
+ logger->log(JvNewStringUTF(p1));
}
diff --git a/frysk-core/frysk/debuginfo/CompilerVersion.java b/frysk-sys/frysk/rsl/cni/Log.hxx
similarity index 82%
copy from frysk-core/frysk/debuginfo/CompilerVersion.java
copy to frysk-sys/frysk/rsl/cni/Log.hxx
index eb50621..bb3ce45 100644
--- a/frysk-core/frysk/debuginfo/CompilerVersion.java
+++ b/frysk-sys/frysk/rsl/cni/Log.hxx
@@ -37,22 +37,14 @@
// version and license this file solely under the GPL without
// exception.
-package frysk.debuginfo;
+extern void logf(frysk::rsl::Log*, const char*, ...)
+ __attribute__((format(printf, 2, 3)));
-import frysk.rsl.Log;
+extern void logf(frysk::rsl::Log*, jobject, const char*, ...)
+ __attribute__((format(printf, 3, 4)));
-public class CompilerVersion {
+extern void log(frysk::rsl::Log*, const char*);
+extern void log(frysk::rsl::Log*, jobject, const char*);
- protected static Log fine = Log.fine(CompilerVersion.class);
- public final String compilerString;
-
- CompilerVersion(String compString) {
- this.compilerString = compString;
- fine.log(this, "Created compilerVersion for:", compString);
- }
-
- public boolean supportsClassType() {
- return false;
- }
-
-}
+extern void log(frysk::rsl::Log*, const char*, jobject);
+extern void log(frysk::rsl::Log*, jobject, const char*, jobject);
diff --git a/frysk-sys/frysk/sys/ChangeLog b/frysk-sys/frysk/sys/ChangeLog
index 8de2b54..18a9c5c 100644
--- a/frysk-sys/frysk/sys/ChangeLog
+++ b/frysk-sys/frysk/sys/ChangeLog
@@ -1,3 +1,25 @@
+2008-02-11 Andrew Cagney <cagney@redhat.com>
+
+ * cni/Errno.hxx: Delete unnecessary #include
+ <java/util/logging/Logger.h>
+
+ * cni/Errno.hxx (logMessage(Logger,Level,const char*,...)): Delete.
+ (jLogMessage(Object,Logger,Level,const char*,...)): Delete.
+ (logFine(Object,Logger,const char*,...)): Delete.
+ (logFinest(Object,Logger,const char*,...)): Delete.
+ (jLogFine(Object,Logger,const char*,...)): Delete.
+ (jLogFinest(Object,Logger,const char*,...)): Delete.
+ * cni/Errno.cxx: Update.
+
+ * TestPipePair.java: Use frysk.rsl.
+ * TestFork.java: Ditto.
+
+ * TestWait.java (testShortTimeout()): Fix comparison test.
+ (setUp(), tearDown()): Simplify timeout computation.
+
+ * Wait.java: Use frysk.rsl.
+ * cni/Wait.cxx: Ditto.
+
2008-02-08 Andrew Cagney <cagney@redhat.com>
* PseudoTerminal.java (getName(int)): Replace getName().
diff --git a/frysk-sys/frysk/sys/TestFork.java b/frysk-sys/frysk/sys/TestFork.java
index ceaab25..cbbc626 100644
--- a/frysk-sys/frysk/sys/TestFork.java
+++ b/frysk-sys/frysk/sys/TestFork.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2007, Red Hat Inc.
+// Copyright 2007, 2008, Red Hat Inc.
//
// FRYSK is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
@@ -41,18 +41,16 @@ package frysk.sys;
import frysk.Config;
import frysk.junit.TestCase;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import frysk.rsl.Log;
import frysk.testbed.TearDownProcess;
/**
* Check the plumming of Fork/exec.
*/
-public class TestFork
- extends TestCase
-{
- static private Logger logger = Logger.getLogger("frysk");
+public class TestFork extends TestCase {
+ private static final Log fine = Log.fine(TestFork.class);
+
private final SignalSet defaultSignalSet
= new SignalSet().getProcMask();
/**
@@ -69,12 +67,12 @@ public class TestFork
* child process.
*/
public void testProcMask () {
- logger.log(Level.FINE, "Masking SIGHUP\n");
+ fine.log("Masking SIGHUP");
SignalSet set = new SignalSet(Signal.HUP);
set.blockProcMask();
assertTrue("SIGHUP masked",
new SignalSet().getProcMask().contains(Signal.HUP));
- logger.log(Level.FINE, "Creating funit-procmask to check the mask\n");
+ fine.log("Creating funit-procmask to check the mask");
ProcessIdentifier pid
= Fork.exec(null, "/dev/null", null,
new String[] {
@@ -91,9 +89,7 @@ public class TestFork
int status;
public void terminated(ProcessIdentifier pid, Signal signal,
int status, boolean coreDumped) {
- logger.log(Level.FINE,
- "exited with status {0,number,integer}\n",
- new Integer(status));
+ fine.log("exited with status", status);
this.pid = pid;
this.signal = signal;
this.status = status;
@@ -103,7 +99,7 @@ public class TestFork
}
}
ExitStatus exitStatus = new ExitStatus();
- logger.log(Level.FINE, "Capturing funit-procmask's exit status\n");
+ fine.log("Capturing funit-procmask's exit status");
Wait.wait(pid, exitStatus,
new SignalBuilder() {
public void signal(Signal sig) {
diff --git a/frysk-sys/frysk/sys/TestPipePair.java b/frysk-sys/frysk/sys/TestPipePair.java
index f03ce05..3ae59e8 100644
--- a/frysk-sys/frysk/sys/TestPipePair.java
+++ b/frysk-sys/frysk/sys/TestPipePair.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2007, Red Hat Inc.
+// Copyright 2007, 2008, Red Hat Inc.
//
// FRYSK is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
@@ -41,18 +41,16 @@ package frysk.sys;
import frysk.junit.TestCase;
import frysk.testbed.Tee;
-import java.util.logging.Logger;
-import java.util.logging.Level;
+import frysk.rsl.Log;
import frysk.Config;
/**
* Test creation of a process wired up to a pipe.
*/
-public class TestPipePair
- extends TestCase
-{
- private static Logger logger = Logger.getLogger("frysk");
+public class TestPipePair extends TestCase {
+ private static final Log fine = Log.fine(TestPipePair.class);
+
private PipePair pipe;
public void tearDown ()
{
@@ -139,12 +137,12 @@ public class TestPipePair
* Test that a daemon's signal mask is empty.
*/
public void testDaemonMask() {
- logger.log(Level.FINE, "Masking SIGHUP\n");
+ fine.log("Masking SIGHUP");
SignalSet set = new SignalSet(Signal.HUP);
set.blockProcMask();
assertTrue("SIGHUP masked",
new SignalSet().getProcMask().contains(Signal.HUP));
- logger.log(Level.FINE, "Creating funit-procmask to check the mask\n");
+ fine.log("Creating funit-procmask to check the mask");
pipe = new DaemonPipePair(funitProcMask);
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-02-11 18:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-11 18:57 [SCM] master: Rename -trace to -debug cagney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).