From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13105 invoked by alias); 14 Apr 2008 19:43:50 -0000 Received: (qmail 13074 invoked by uid 367); 14 Apr 2008 19:43:49 -0000 Date: Mon, 14 Apr 2008 19:43:00 -0000 Message-ID: <20080414194349.13058.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: frysk-gui/frysk/gui/ChangeLog X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 50dd27460503311919f41c0c2ad58f150875fd3a X-Git-Newrev: f52d581e1acd78bbe6c62be4f3dd2f050e3636b7 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00097.txt.bz2 The branch, master has been updated via f52d581e1acd78bbe6c62be4f3dd2f050e3636b7 (commit) from 50dd27460503311919f41c0c2ad58f150875fd3a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f52d581e1acd78bbe6c62be4f3dd2f050e3636b7 Author: Andrew Cagney Date: Mon Apr 14 15:42:29 2008 -0400 frysk-gui/frysk/gui/ChangeLog 2008-04-14 Andrew Cagney * test/GuiTestCase.java: Move getFryskTestDir() to here. frysk-sys/frysk/config/ChangeLog 2008-04-14 Andrew Cagney * Config.java (getFryskTestDir()): Delete. ----------------------------------------------------------------------- Summary of changes: frysk-gui/frysk/gui/ChangeLog | 4 ++++ frysk-gui/frysk/gui/test/GuiTestCase.java | 28 ++++++++++++++++++++++++++-- frysk-sys/frysk/config/ChangeLog | 2 ++ frysk-sys/frysk/config/Config.java | 18 ------------------ 4 files changed, 32 insertions(+), 20 deletions(-) First 500 lines of diff: diff --git a/frysk-gui/frysk/gui/ChangeLog b/frysk-gui/frysk/gui/ChangeLog index 509718b..696c4c4 100644 --- a/frysk-gui/frysk/gui/ChangeLog +++ b/frysk-gui/frysk/gui/ChangeLog @@ -1,3 +1,7 @@ +2008-04-14 Andrew Cagney + + * test/GuiTestCase.java: Move getFryskTestDir() to here. + 2008-04-01 Petr Machata * disassembler/DisassemblyWindow.java: Call getAddresses instead of getSymbol. diff --git a/frysk-gui/frysk/gui/test/GuiTestCase.java b/frysk-gui/frysk/gui/test/GuiTestCase.java index 280d992..12b1ff9 100644 --- a/frysk-gui/frysk/gui/test/GuiTestCase.java +++ b/frysk-gui/frysk/gui/test/GuiTestCase.java @@ -41,8 +41,8 @@ package frysk.gui.test; import java.io.File; -import frysk.config.Config; import frysk.junit.TestCase; +import frysk.testbed.TearDownFile; public class GuiTestCase extends TestCase{ public static File TEST_DIR; @@ -50,11 +50,35 @@ public class GuiTestCase extends TestCase{ public static File SESSIONS_TEST_DIR ; public static File TAGSETS_TEST_DIR; + + /** + * FIXME: Should have a frysk.testbed.TearDownDirectory factory + * that handles all this. + */ + private File getFryskTestDir() throws Exception { + File file = null; + file = TearDownFile.create(); + + String path = file.getAbsolutePath(); + file.delete(); + file = new File(path); + + if(!file.mkdirs()){ + throw new Exception("Could not create test directory " + file.getAbsolutePath()); + } + + // FIXME: deleteOnExit() isn't really reliable; especially + // when there's no guarentee that the directory contains no + // files; should be a TearDownDirectory object. + file.deleteOnExit(); + return file; + } + protected void setUp () throws Exception { super.setUp(); - TEST_DIR = Config.getFryskTestDir(); + TEST_DIR = getFryskTestDir(); OBSERVERS_TEST_DIR = new File(TEST_DIR.getPath() + "/Observers/"); SESSIONS_TEST_DIR = new File(TEST_DIR.getPath() + "/Sessions/"); TAGSETS_TEST_DIR = new File(TEST_DIR.getPath() + "/Tagsets/"); diff --git a/frysk-sys/frysk/config/ChangeLog b/frysk-sys/frysk/config/ChangeLog index 0d6da54..1d6ad89 100644 --- a/frysk-sys/frysk/config/ChangeLog +++ b/frysk-sys/frysk/config/ChangeLog @@ -1,5 +1,7 @@ 2008-04-14 Andrew Cagney + * Config.java (getFryskTestDir()): Delete. + * jni/Config.cxx (Java_frysk_config_Config_getWordSize): Delete. (Java_frysk_config_Config_getTargetCpuXXX): Delete. * cni/Config.cxx-in (Config::getWordSize): Delete. diff --git a/frysk-sys/frysk/config/Config.java b/frysk-sys/frysk/config/Config.java index e08bc93..e0be0c3 100644 --- a/frysk-sys/frysk/config/Config.java +++ b/frysk-sys/frysk/config/Config.java @@ -41,8 +41,6 @@ package frysk.config; import java.io.File; -import frysk.testbed.TearDownFile; - /** * All the run-time (install time) configuration information. */ @@ -219,22 +217,6 @@ public class Config return file; } - public static File getFryskTestDir() throws Exception { - File file = null; - file = TearDownFile.create(); - - String path = file.getAbsolutePath(); - file.delete(); - file = new File(path); - - if(!file.mkdirs()){ - throw new Exception("Could not create test directory " + file.getAbsolutePath()); - } - - file.deleteOnExit(); - return file; - } - public static File getHomeDir() { //XXX: Should not use user.home property. return new File(System.getProperty("user.home")); hooks/post-receive -- frysk system monitor/debugger