From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16080 invoked by alias); 9 Apr 2008 01:36:38 -0000 Received: (qmail 16054 invoked by uid 440); 9 Apr 2008 01:36:37 -0000 Date: Wed, 09 Apr 2008 01:36:00 -0000 Message-ID: <20080409013637.16039.qmail@sourceware.org> From: scox@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Add test for chroot libraries. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9305be13d1afb83b0c2e9ea006c0b91a44c9e9fd X-Git-Newrev: d1a490efa853a1a7c0d4c8f9c19e104950ade138 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/msg00068.txt.bz2 The branch, master has been updated via d1a490efa853a1a7c0d4c8f9c19e104950ade138 (commit) from 9305be13d1afb83b0c2e9ea006c0b91a44c9e9fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit d1a490efa853a1a7c0d4c8f9c19e104950ade138 Author: Stan Cox Date: Tue Apr 8 21:29:28 2008 -0400 Add test for chroot libraries. * Makefile.am (frysk/pkglibdir/funit-addresses-stripped): Remove. (frysk/pkglibdir/test-sysroot): New. (frysk/pkglibdir/arch32/funit-addresses-stripped): Remove. (frysk/pkglibdir/arch32/test-sysroot): New. * TestSysRoot.java (testHaveSysRoot): Use funit-quicksort instead of funit-addresses. ----------------------------------------------------------------------- Summary of changes: frysk-core/ChangeLog | 7 ++++ frysk-core/Makefile.am | 59 ++++++++++++++++++-------------- frysk-core/frysk/hpd/ChangeLog | 8 ++++- frysk-core/frysk/hpd/TestSysRoot.java | 21 ++++++----- 4 files changed, 58 insertions(+), 37 deletions(-) First 500 lines of diff: diff --git a/frysk-core/ChangeLog b/frysk-core/ChangeLog index 64feb86..b481cb7 100644 --- a/frysk-core/ChangeLog +++ b/frysk-core/ChangeLog @@ -1,3 +1,10 @@ +2008-04-08 Stan Cox + + * Makefile.am (frysk/pkglibdir/funit-addresses-stripped): Remove. + (frysk/pkglibdir/test-sysroot): New. + (frysk/pkglibdir/arch32/funit-addresses-stripped): Remove. + (frysk/pkglibdir/arch32/test-sysroot): New. + 2008-03-16 Stan Cox * Makefile.am (TestTypeFactory.java): Rename from TestTypeEntry.java. diff --git a/frysk-core/Makefile.am b/frysk-core/Makefile.am index 9f5f420..6904ce6 100644 --- a/frysk-core/Makefile.am +++ b/frysk-core/Makefile.am @@ -231,19 +231,23 @@ frysk_pkglibdir_funit_quicksort_LINK = $(LINK) $(srcdir)/frysk/pkglibdir/funit-b # Create sysroot for TestSysRoot.java -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; \ - /usr/lib/rpm/debugedit -b $(abspath frysk/pkglibdir/test-sysroot) -d / ../../bin/funit-addresses; \ - eu-strip --remove-comment -f ../../lib/debug/usr/bin/funit-addresses.debug ../../bin/funit-addresses) +all-local: frysk/pkglibdir/test-sysroot frysk/pkglibdir/arch32/test-sysroot +frysk/pkglibdir/test-sysroot: $(frysk_pkglibdir_funit_quicksort_SOURCES) + mkdir -p $@/usr/src/debug + cp $(abspath $(srcdir)/$(frysk_pkglibdir_funit_quicksort_SOURCES)) \ + $@/usr/src/debug + cp $(abspath $(srcdir)/$(frysk_pkglibdir_funit_bubblesort_SOURCES)) \ + $@/usr/src/debug + mkdir -p $@/usr/bin + mkdir -p $@/usr/lib/debug/usr/bin + mkdir -p $@/usr/lib/debug/usr/lib + (cd $@/usr/src/debug; \ + $(COMPILE) funit-bubblesort.c -fpic -shared -o ../../lib/libbubble.so -g; \ + $(COMPILE) funit-quicksort.c -L ../../lib -lbubble -g -o ../../bin/funit-quicksort -DNO_MAIN) + /usr/lib/rpm/debugedit -b $(abspath $@) -d / $@/usr/bin/funit-quicksort + /usr/lib/rpm/debugedit -b $(abspath $@) -d / $@/usr/lib/libbubble.so + eu-strip --remove-comment -f $@/usr/lib/debug/usr/bin/funit-quicksort.debug $@/usr/bin/funit-quicksort; \ + eu-strip --remove-comment -f $@/usr/lib/debug/usr/lib/funit-bubblesort.debug $@/usr/lib/libbubble.so; install-exec-local: install-sysroot-local uninstall-local: uninstall-sysroot-local @@ -273,19 +277,22 @@ frysk/pkglibdir/arch32/funit-symbols-stripped: frysk/pkglibdir/arch32/funit-symb frysk_pkglibdir_arch32_funit_quicksort_LINK += $(srcdir)/frysk/pkglibdir/funit-bubblesort.c -DNO_MAIN -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) +frysk/pkglibdir/arch32/test-sysroot: $(frysk_pkglibdir_arch32_funit_quicksort_SOURCES) + mkdir -p $@/usr/src/debug + cp $(abspath $(srcdir)/$(frysk_pkglibdir_arch32_funit_quicksort_SOURCES)) \ + $@/usr/src/debug + cp $(abspath $(srcdir)/$(frysk_pkglibdir_arch32_funit_bubblesort_SOURCES)) \ + $@/usr/src/debug + mkdir -p $@/usr/bin + mkdir -p $@/usr/lib/debug/usr/bin + mkdir -p $@/usr/lib/debug/usr/lib + (cd $@/usr/src/debug; \ + $(ARCH32_COMPILE) funit-bubblesort.c -fpic -shared -o ../../lib/libbubble.so -g; \ + $(ARCH32_COMPILE) funit-quicksort.c -L ../../lib -lbubble -g -o ../../bin/funit-quicksort -DNO_MAIN) + /usr/lib/rpm/debugedit -b $(abspath $@) -d / $@/usr/bin/funit-quicksort + /usr/lib/rpm/debugedit -b $(abspath $@) -d / $@/usr/lib/libbubble.so + eu-strip --remove-comment -f $@/usr/lib/debug/usr/bin/funit-quicksort.debug $@/usr/bin/funit-quicksort; \ + eu-strip --remove-comment -f $@/usr/lib/debug/usr/lib/funit-bubblesort.debug $@/usr/lib/libbubble.so; endif diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index ed780f2..87296fb 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,6 +1,12 @@ +2008-04-08 Stan Cox + + * TestSysRoot.java (testHaveSysRoot): Use funit-quicksort instead of + funit-addresses. + 2008-04-08 Sami Wagiaalla - moved getSymbolDie(String input) from DebugInfo to ObjectDeclarationSearchEngine + Moved getSymbolDie(String input) from DebugInfo to + ObjectDeclarationSearchEngine. * ListCommand.java: Updated. * BreakpointCommand.java: Updated diff --git a/frysk-core/frysk/hpd/TestSysRoot.java b/frysk-core/frysk/hpd/TestSysRoot.java index 3d37aab..a604089 100644 --- a/frysk-core/frysk/hpd/TestSysRoot.java +++ b/frysk-core/frysk/hpd/TestSysRoot.java @@ -54,21 +54,22 @@ public class TestSysRoot extends TestLib { public void testHaveSysRoot() { File testSysRootDir = Config.getPkgLibFile("test-sysroot"); - File testPath = Config.getPkgLibFile("funit-addresses"); + File testPath = Config.getPkgLibFile("funit-quicksort"); e.sendCommandExpectPrompt("load " - + testSysRootDir.getAbsolutePath() + "/usr/bin/" + testPath.getName() + + 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("go\n"); + e.expect("go.*\n" + prompt + "Breakpoint.*"); + e.sendCommandExpectPrompt("list",".*84.*84.*85.*85.*"); + e.sendCommandExpectPrompt("next","Task stopped at line.*"); + e.sendCommandExpectPrompt("next","Task stopped at line.*"); + e.sendCommandExpectPrompt("next","Task stopped at line.*"); + e.sendCommandExpectPrompt("print littlest", "-49.*"); + e.sendCommandExpectPrompt("print biggest", "49.*"); + e.sendCommandExpectPrompt("go", ".*Running.*"); e.send("quit"); e.close(); } hooks/post-receive -- frysk system monitor/debugger