This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Move installation of test-sysroot to pkglibdir.
- From: scox at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 30 Jan 2008 03:27:10 -0000
- Subject: [SCM] master: Move installation of test-sysroot to pkglibdir.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via f96c440e566a2a25d4011e061bc75e1ce98c378c (commit)
via f663447e6afbb67e69e71b9a28e357f82841234a (commit)
from a64ca5fc6fca9c433c1ffe95bc3a7002b2b93a93 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit f96c440e566a2a25d4011e061bc75e1ce98c378c
Merge: f663447e6afbb67e69e71b9a28e357f82841234a a64ca5fc6fca9c433c1ffe95bc3a7002b2b93a93
Author: Stan Cox <scox@redhat.com>
Date: Tue Jan 29 22:18:01 2008 -0500
Move installation of test-sysroot to pkglibdir.
* Makefile.am (pkglib_PROGRAMS): Add funit-addresses-stripped.
Remove nobase_pkgdata_DATA.
* TestSysRoot.java (testHaveSysRoot): test-sysroot now lives in
pkglibdir. Use sendCommandExpectPrompt.
commit f663447e6afbb67e69e71b9a28e357f82841234a
Author: Stan Cox <scox@redhat.com>
Date: Tue Jan 29 22:13:05 2008 -0500
Move installation of test-sysroot to pkglibdir.
* Makefile.am (pkglib_PROGRAMS): Add funit-addresses-stripped.
Remove nobase_pkgdata_DATA.
* TestSysRoot.java (testHaveSysRoot): test-sysroot now lives in
pkglibdir. Use sendCommandExpectPrompt.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/ChangeLog | 5 +++
frysk-core/Makefile.am | 59 +++++++++++++++++++++------------
frysk-core/frysk/hpd/ChangeLog | 7 +++-
frysk-core/frysk/hpd/TestSysRoot.java | 50 ++++++++++++---------------
4 files changed, 70 insertions(+), 51 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/ChangeLog b/frysk-core/ChangeLog
index 20ba130..a2a2897 100644
--- a/frysk-core/ChangeLog
+++ b/frysk-core/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-29 Stan Cox <scox@redhat.com>
+
+ * Makefile.am (pkglib_PROGRAMS): Add funit-addresses-stripped.
+ Remove nobase_pkgdata_DATA.
+
2008-01-23 Mark Wielaard <mwielaard@redhat.com>
* Makefile.am: Add rules to create -nodebug and -noeh versions of
diff --git a/frysk-core/Makefile.am b/frysk-core/Makefile.am
index 10d88cc..7349087 100644
--- a/frysk-core/Makefile.am
+++ b/frysk-core/Makefile.am
@@ -225,28 +225,31 @@ frysk_pkglibdir_funit_symbols_stripped_SOURCES =
frysk/pkglibdir/funit-symbols-stripped: frysk/pkglibdir/funit-symbols
strip -o $@ frysk/pkglibdir/funit-symbols
-nobase_pkgdata_DATA = frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
-frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses): frysk/pkglibdir/funit-addresses
- mkdir -p $(abspath frysk/pkgdatadir/test-sysroot)/$(abspath frysk/pkglibdir)
- cp -r $< $@
+pkglib_PROGRAMS += frysk/pkglibdir/funit-addresses-stripped
+frysk_pkglibdir_funit_addresses_stripped_SOURCES =
+frysk/pkglibdir/funit-addresses-stripped: frysk/pkglibdir/funit-addresses
+ cp $< $@
+ mkdir -p frysk/pkglibdir/test-sysroot/usr/src/debug
+ cp $(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c) \
+ frysk/pkglibdir/test-sysroot/usr/src/debug
+ mkdir -p frysk/pkglibdir/test-sysroot/usr/bin
+ mkdir -p frysk/pkglibdir/test-sysroot/usr/lib/debug/usr/bin
+ (cd frysk/pkglibdir/test-sysroot/usr/src/debug; \
+ gcc -g funit-addresses.c -o ../../bin/funit-addresses; \
+ eu-strip --remove-comment -f ../../lib/debug/usr/bin/funit-addresses.debug ../../bin/funit-addresses; \
+ /usr/lib/rpm/debugedit -b $(abspath frysk/pkglibdir/test-sysroot) -d / ../../lib/debug/usr/bin/funit-addresses.debug)
-nobase_pkgdata_DATA += frysk/pkgdatadir/test-sysroot/$(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c)
-frysk/pkgdatadir/test-sysroot/$(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c): \
-frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
- mkdir -p $(abspath frysk/pkgdatadir/test-sysroot)/$(abspath $(srcdir)/frysk/pkglibdir)
- cp $(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c) $@
-
-nobase_pkgdata_DATA += frysk/pkgdatadir/test-sysroot/usr/lib/debug/$(abspath frysk/pkglibdir/funit-addresses.debug)
-frysk/pkgdatadir/test-sysroot/usr/lib/debug/$(abspath frysk/pkglibdir/funit-addresses.debug): frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
- mkdir -p $(abspath frysk/pkgdatadir/test-sysroot/usr/lib/debug/)/$(abspath frysk/pkglibdir)
- eu-strip --remove-comment -f $@ $<
-
-install-data-hook:
- mv $(datarootdir)/frysk/frysk/pkgdatadir/test-sysroot $(datarootdir)/frysk
- rmdir $(datarootdir)/frysk/frysk/pkgdatadir
- rmdir $(datarootdir)/frysk/frysk
+install-exec-local: install-sysroot-local
+uninstall-local: uninstall-sysroot-local
+.PHONY: install-sysroot-local uninstall-sysroot-local
+install-sysroot-local:
+ cp -r frysk/pkglibdir/test-sysroot $(pkglibdir)
+ cp -r frysk/pkglibdir/arch32/test-sysroot $(pkglib32dir)
# we don't want this installed, but noinst_SCRIPTS has no effect
- rm $(libdir)/frysk/gen-type-funit-tests
+ rm -f $(libdir)/frysk/gen-type-funit-tests
+uninstall-sysroot-local:
+ rm -rf $(pkglibdir)/test-sysroot
+ rm -rf $(pkglib32dir)/test-sysroot
if DO_ARCH32_TEST
pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
@@ -260,10 +263,24 @@ frysk_pkglibdir_arch32_funit_symbols_stripped_SOURCES =
frysk/pkglibdir/arch32/funit-symbols-stripped: frysk/pkglibdir/arch32/funit-symbols
strip -o $@ frysk/pkglibdir/arch32/funit-symbols
+pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-addresses-stripped
+frysk_pkglibdir_arch32_funit_addresses_stripped_SOURCES =
+frysk/pkglibdir/arch32/funit-addresses-stripped: frysk/pkglibdir/arch32/funit-addresses
+ cp $< $@
+ mkdir -p frysk/pkglibdir/arch32/test-sysroot/usr/src/debug
+ cp $(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c) \
+ frysk/pkglibdir/arch32/test-sysroot/usr/src/debug
+ mkdir -p frysk/pkglibdir/arch32/test-sysroot/usr/bin
+ mkdir -p frysk/pkglibdir/arch32/test-sysroot/usr/lib/debug/usr/bin
+ (cd frysk/pkglibdir/arch32/test-sysroot/usr/src/debug; \
+ gcc -g -m32 funit-addresses.c -o ../../bin/funit-addresses; \
+ eu-strip --remove-comment -f ../../lib/debug/usr/bin/funit-addresses.debug ../../bin/funit-addresses; \
+ /usr/lib/rpm/debugedit -b $(abspath frysk/pkglibdir/arch32/test-sysroot) -d / ../../lib/debug/usr/bin/funit-addresses.debug)
+
endif
# frysk-core code needs to be able to find the core files found in
-# frysk-sys/frysk/pkgdatadir/. Since frysk-core can only see
+# frysk-sys/frysk/pkgddatadir/. Since frysk-core can only see
# frysk-core/frysk/pkgdatadir/ add links to the unpacked core files in
# frysk-sys.
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 7f9ec5c..0a80c6b 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-29 Stan Cox <scox@redhat.com>
+
+ * TestSysRoot.java (testHaveSysRoot): test-sysroot now lives in
+ pkglibdir. Use sendCommandExpectPrompt.
+
2008-01-29 Rick Moseley <rmoseley@redhat.com>
* StartRun.java: Kill each proc only once(bz #5691).
@@ -6,10 +11,8 @@
* TestHpdTestHarness.java: Fix pattern matches.
-
* TestHpdTestHarness.java: Change e.send to e.sendCommandExpectPrompt.
-
2008-01-25 Andrew Cagney <cagney@redhat.com>
* TestLib.java: Replace Expect with TearDownExpect.
diff --git a/frysk-core/frysk/hpd/TestSysRoot.java b/frysk-core/frysk/hpd/TestSysRoot.java
index bec54c7..b2cb0be 100644
--- a/frysk-core/frysk/hpd/TestSysRoot.java
+++ b/frysk-core/frysk/hpd/TestSysRoot.java
@@ -40,7 +40,6 @@
package frysk.hpd;
import frysk.Config;
-import frysk.testbed.TearDownExpect;
import java.io.File;
/**
@@ -48,34 +47,29 @@ import java.io.File;
*/
public class TestSysRoot extends TestLib {
+ public void setUp() {
+ super.setUp();
+ e = new HpdTestbed();
+ }
+
public void testHaveSysRoot() {
- if (unresolved(5657))
- return;
- File testSysRootDir = Config.getPkgDataFile("test-sysroot");
+ File testSysRootDir = Config.getPkgLibFile("test-sysroot");
File testPath = Config.getPkgLibFile("funit-addresses");
- child = new TearDownExpect(new String[] {
- Config.getBinFile("fhpd").getAbsolutePath(),
- "-sysroot", testSysRootDir.getAbsolutePath(),
- testSysRootDir.getAbsolutePath() + "/" + testPath
- });
- child.expect(prompt);
- child.send("break main\n");
- child.expect(prompt);
- child.send("run\n");
- child.expect("Breakpoint");
- child.send("list\n");
- child.expect(".*int main.int argc, char. argv.*");
- child.send("next\n");
- child.expect(prompt);
- child.send("next\n");
- child.expect(prompt);
- child.send("next\n");
- child.expect(prompt);
- child.send("print static_int\n");
- child.expect("22.*" + prompt);
- child.send("print volatile_int\n");
- child.expect("33.*" + prompt);
- child.send("quit");
- child.close();
+ e.sendCommandExpectPrompt("load "
+ + testSysRootDir.getAbsolutePath() + "/usr/bin/" + testPath.getName()
+ + " -sysroot " + testSysRootDir.getAbsolutePath(),
+ "Loaded executable file.*");
+ e.sendCommandExpectPrompt("start", "Attached to process.*");
+ e.sendCommandExpectPrompt("break main", "breakpoint.*");
+ e.send("go\n");
+ e.expect("go.*\n" + prompt + "Breakpoint");
+ e.sendCommandExpectPrompt("list",".*int main.int argc, char. argv.*");
+ e.sendCommandExpectPrompt("step", ".*stopped.*");
+ e.sendCommandExpectPrompt("step", ".*stopped.*");
+ e.sendCommandExpectPrompt("step", ".*stopped.*");
+ e.sendCommandExpectPrompt("print static_int", ".*22.*");
+ e.sendCommandExpectPrompt("print volatile_int", ".*33.*");
+ e.send("quit");
+ e.close();
}
}
hooks/post-receive
--
frysk system monitor/debugger