This is the mail archive of the frysk-cvs@sources.redhat.com mailing list for the frysk project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[SCM] master: Make TestSysRoot runnable by TestRunner.

From: scox at sourceware dot org
To: frysk-cvs at sourceware dot org
Date: 15 Jan 2008 20:03:31 -0000
Subject: [SCM] master: Make TestSysRoot runnable by TestRunner.
Reply-to: frysk at sourceware dot org

The branch, master has been updated
       via  195dbd82a19661fb6839274d047178cae498747d (commit)
      from  f7cc97ed59d2eaf2a188eb800b496a1b39c96c34 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 195dbd82a19661fb6839274d047178cae498747d
Author: Stan Cox <scox@redhat.com>
Date:   Tue Jan 15 14:53:39 2008 -0500

    Make TestSysRoot runnable by TestRunner.
    
    * Makefile.am (pkgdatadir/test-sysroot): New.
    * TestSysRoot.java (testHaveSysRoot): Test sysroot is now in pkgdatadir.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/ChangeLog                  |    4 ++++
 frysk-core/Makefile.am                |   24 +++++++++++++++---------
 frysk-core/frysk/hpd/ChangeLog        |    4 ++++
 frysk-core/frysk/hpd/TestSysRoot.java |   12 +++---------
 4 files changed, 26 insertions(+), 18 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/ChangeLog b/frysk-core/ChangeLog
index 788a81b..ed8602c 100644
--- a/frysk-core/ChangeLog
+++ b/frysk-core/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-15  Stan Cox  <scox@redhat.com>
+
+	* Makefile.am (pkgdatadir/test-sysroot): New.
+
 2008-01-13  Stan Cox  <scox@redhat.com>
 
 	* Makefile.am (frysk/pkglibdir/funit-addresses-stripped): New.
diff --git a/frysk-core/Makefile.am b/frysk-core/Makefile.am
index 0256692..b6102f1 100644
--- a/frysk-core/Makefile.am
+++ b/frysk-core/Makefile.am
@@ -110,15 +110,21 @@ frysk_pkglibdir_funit_symbols_stripped_SOURCES =
 frysk/pkglibdir/funit-symbols-stripped: frysk/pkglibdir/funit-symbols
 	strip -o $@ frysk/pkglibdir/funit-symbols
 
-frysk/pkglibdir/funit-addresses-stripped: frysk/pkglibdir/funit-addresses
-	strip -o $@ frysk/pkglibdir/funit-addresses
-	mkdir -p `pwd`/frysk/pkglibdir/test-sysroot/`pwd`/frysk/pkglibdir
-	cp -r `pwd`/frysk/pkglibdir/funit-addresses `pwd`/frysk/pkglibdir/test-sysroot/`pwd`/frysk/pkglibdir
-	mkdir -p `pwd`/frysk/pkglibdir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir
-	cp -r $(realpath $(srcdir))/frysk/pkglibdir/funit-addresses.c `pwd`/frysk/pkglibdir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir
-	mkdir -p `pwd`/frysk/pkglibdir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/
-	eu-strip --remove-comment -f `pwd`/frysk/pkglibdir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/funit-addresses.debug \
-	`pwd`/frysk/pkglibdir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses
+pkgdata_DATA += frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses
+frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses: frysk/pkglibdir/funit-addresses
+	mkdir -p `pwd`/frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir
+	cp -r $< $@
+
+pkgdata_DATA += frysk/pkgdatadir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir/funit-addresses.c
+frysk/pkgdatadir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir/funit-addresses.c: \
+frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses
+	mkdir -p `pwd`/frysk/pkgdatadir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir
+	cp $(realpath $(srcdir))/frysk/pkglibdir/funit-addresses.c $@
+
+pkgdata_DATA += frysk/pkgdatadir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/funit-addresses.debug
+frysk/pkgdatadir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/funit-addresses.debug: frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses
+	mkdir -p `pwd`/frysk/pkgdatadir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/
+	eu-strip --remove-comment -f $@ $<
 
 if DO_ARCH32_TEST
 pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 2943153..abe5e64 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-15  Andrew Cagney  <cagney@redhat.com>
 
+	* TestSysRoot.java (testHaveSysRoot): Test sysroot is now in pkgdatadir.
+
+2008-01-15  Stan Cox  <scox@redhat.com>
+
 	* TestSysRoot.java: Mark as unresolved, bug 5619.
 
 2008-01-15  Rick Moseley  <rmoseley@redhat.com>
diff --git a/frysk-core/frysk/hpd/TestSysRoot.java b/frysk-core/frysk/hpd/TestSysRoot.java
index 950357e..8cc2a5c 100644
--- a/frysk-core/frysk/hpd/TestSysRoot.java
+++ b/frysk-core/frysk/hpd/TestSysRoot.java
@@ -55,18 +55,12 @@ public class TestSysRoot extends TestLib {
   }
 
     public void testHaveSysRoot() {
-	if (unresolved(5619))
-	    return;
+	File testSysRootDir = Config.getPkgDataFile("test-sysroot");
 	File testPath = Config.getPkgLibFile("funit-addresses");
-	System.out.println(Config.getBinFile("fhpd").getAbsolutePath() +
-		" -sysroot " + testPath.getParent() + "/test-sysroot/ " +
-	        testPath.getParent() + "/test-sysroot/"
-			   + testPath.getAbsolutePath());
 	child = new Expect(new String[] {
 		Config.getBinFile("fhpd").getAbsolutePath(),
-		"-sysroot", testPath.getParent() + "/test-sysroot/",
-	        testPath.getParent() + "/test-sysroot/"
-		+ testPath.getAbsolutePath()
+		"-sysroot", testSysRootDir.getAbsolutePath(),
+	        testSysRootDir.getAbsolutePath() + "/" + testPath
 	    });
 	child.expect(prompt);
 	child.send("break main\n");


hooks/post-receive
--
frysk system monitor/debugger

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]