diff options
| author | Tim Moore <timoore@redhat.com> | 2009-12-23 09:14:02 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2009-12-23 09:14:02 +0100 |
| commit | 69ce6c79dbcb2cec2d1245935ef20bf832ffe70a (patch) | |
| tree | 0b6aea71ef4f3ca5c797494d062819bfba63e7f7 /testsuite/systemtap.apps/xulrunner.exp | |
| parent | 72195f6b17c0ed2e508c58bf3cadd5b9dc4e28ac (diff) | |
| parent | 0ee3adb42f2f6d8bffe177e77a415b3a74f3a777 (diff) | |
| download | systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.tar.gz systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.tar.xz systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'testsuite/systemtap.apps/xulrunner.exp')
| -rw-r--r-- | testsuite/systemtap.apps/xulrunner.exp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/testsuite/systemtap.apps/xulrunner.exp b/testsuite/systemtap.apps/xulrunner.exp index be2db0c7..7a6b934a 100644 --- a/testsuite/systemtap.apps/xulrunner.exp +++ b/testsuite/systemtap.apps/xulrunner.exp @@ -4,13 +4,15 @@ set test "xulrunner" global env -if {! [info exists env(SYSTEMTAP_TEST_SDT)]} { - unsupported "xulrunner (\"SYSTEMTAP_TEST_SDT\" not in env)" +if {! [info exists env(SYSTEMTAP_TESTAPPS)] || ( + ! [string match "tcl" $env(SYSTEMTAP_TESTAPPS)] && + ! [string match "all" $env(SYSTEMTAP_TESTAPPS)])} { + untested "$test sdt app" return } ########## Create /tmp/stap-xul.stp ########## -set xulrelease "1.9.1.3" +set xulrelease "1.9.1.4" set xuldir "[pwd]/xul/" set testsuite "[pwd]" @@ -76,13 +78,13 @@ fi \} ##### end run_tests ##### -if \[ ! -r xulrunner-$xulrelease-source.tar \] ; then -wget ftp://ftp.mozilla.org/pub/mozilla.org/xul/releases/$xulrelease/source/xulrunner-$xulrelease-source.tar.bz2 -bunzip2 xulrunner-$xulrelease-source.tar.bz2 +if \[ ! -r xulrunner-$xulrelease.source.tar.bz2 \] ; then +wget ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$xulrelease/source/xulrunner-$xulrelease.source.tar.bz2 fi if \[ ! -d xul/src \] ; then -tar -x -f xulrunner-$xulrelease-source.tar +bunzip2 xulrunner-$xulrelease.source.tar.bz2 +tar -x -f xulrunner-$xulrelease.source.tar mkdir xul xulrelease=$xulrelease mv mozilla-\${xulrelease%.\[0-9\]} xul/src @@ -101,6 +103,8 @@ CXXFLAGS='-g -I$env(SYSTEMTAP_INCLUDES)' \ CFLAGS='-g -I$env(SYSTEMTAP_INCLUDES)' \ PATH=$env(SYSTEMTAP_PATH)/:\$PATH \ ../src/configure --prefix=$xuldir --enable-dtrace --enable-application=xulrunner +sed -i '/include.*rules.mk/a\ +PROGOBJS+=./mozjs-dtrace.o' xul/bld/js/src/Makefile J=\$(getconf _NPROCESSORS_CONF) make -j \$J fi |