diff options
author | Michael Larabel <michael@phx-laptop.(none)> | 2008-05-26 11:07:10 -0400 |
---|---|---|
committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-05-26 11:07:10 -0400 |
commit | b42d37270c2d45ac5d119431ddcb971b9b21a7cf (patch) | |
tree | a7a8c40fa33802eb6e2762d02e4d86e77bf83cfd | |
parent | 0d78e865a4743176c0d5286997b3e25b059b5d0e (diff) | |
download | phoronix-test-suite-upstream-b42d37270c2d45ac5d119431ddcb971b9b21a7cf.tar.gz phoronix-test-suite-upstream-b42d37270c2d45ac5d119431ddcb971b9b21a7cf.tar.xz phoronix-test-suite-upstream-b42d37270c2d45ac5d119431ddcb971b9b21a7cf.zip |
Remove "cd $1" from un-needed areas of install.sh due to improvements in
previous commit.
45 files changed, 2 insertions, 84 deletions
diff --git a/documentation/guide-write-test-profile.txt b/documentation/guide-write-test-profile.txt index 9fbc959..471f09c 100644 --- a/documentation/guide-write-test-profile.txt +++ b/documentation/guide-write-test-profile.txt @@ -49,7 +49,7 @@ This XML profile is what interfaces with the Phoronix Test Suite and provides al The next step is to write the install.sh file, which once called by the Phoronix Test Suite is intended to install the test locally for benchmarking purposes. The install.sh file is technically optional, but is generally used by all tests. Alternatively, the file may be named install.php if you wish to write the install script in PHP instead of a shell script. Note: The first argument supplied to the install script is the directory that the test needs to be installed to. The install.sh file (in our instance) is to be placed inside pts/test-resources/sample-program. Below is the install.sh for the sample-program. #!/bin/sh -cd $1 + tar -xjf sample-pi-program-1.tar.bz2 g++ sample-pi-program.cpp -o sample-pi-program diff --git a/pts/test-resources/build-apache/install.sh b/pts/test-resources/build-apache/install.sh index ebf9d6c..91240a5 100644 --- a/pts/test-resources/build-apache/install.sh +++ b/pts/test-resources/build-apache/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - echo "#!/bin/sh rm -rf httpd-2.2.8/ tar -xvf httpd-2.2.8.tar.gz diff --git a/pts/test-resources/build-imagemagick/install.sh b/pts/test-resources/build-imagemagick/install.sh index 7a36e1f..1935972 100644 --- a/pts/test-resources/build-imagemagick/install.sh +++ b/pts/test-resources/build-imagemagick/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - echo "#!/bin/sh if [ ! -f image-magick.tar.bz2 ] diff --git a/pts/test-resources/build-linux-kernel/install.sh b/pts/test-resources/build-linux-kernel/install.sh index fd1a833..9c4e070 100644 --- a/pts/test-resources/build-linux-kernel/install.sh +++ b/pts/test-resources/build-linux-kernel/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf linux-2625-config.tar.gz echo "#!/bin/sh diff --git a/pts/test-resources/build-mplayer/install.sh b/pts/test-resources/build-mplayer/install.sh index 96fc175..bca5143 100644 --- a/pts/test-resources/build-mplayer/install.sh +++ b/pts/test-resources/build-mplayer/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - echo "#!/bin/sh if [ ! -f MPlayer-1.0rc2.tar.bz2 ] diff --git a/pts/test-resources/build-php/install.sh b/pts/test-resources/build-php/install.sh index 8b95468..3c63385 100644 --- a/pts/test-resources/build-php/install.sh +++ b/pts/test-resources/build-php/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - THIS_DIR=$(pwd) mkdir $THIS_DIR/libxml2 diff --git a/pts/test-resources/compliance-ogl/install.sh b/pts/test-resources/compliance-ogl/install.sh index 000a0b8..f3f9c6a 100644 --- a/pts/test-resources/compliance-ogl/install.sh +++ b/pts/test-resources/compliance-ogl/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf glew-1.5.0-src.tgz cd glew/ make -j $NUM_CPU_JOBS diff --git a/pts/test-resources/compress-7zip/install.sh b/pts/test-resources/compress-7zip/install.sh index 809acc9..bcf8aa6 100644 --- a/pts/test-resources/compress-7zip/install.sh +++ b/pts/test-resources/compress-7zip/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xjf p7zip_4.57_src_all.tar.bz2 cd p7zip_4.57/ make -j $NUM_CPU_JOBS diff --git a/pts/test-resources/compress-gzip/install.sh b/pts/test-resources/compress-gzip/install.sh index 890b850..a773ef4 100755 --- a/pts/test-resources/compress-gzip/install.sh +++ b/pts/test-resources/compress-gzip/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - cat > gzip_process <<EOT #!/bin/sh cat compressfile | gzip -c > /dev/null diff --git a/pts/test-resources/compress-pbzip2/install.sh b/pts/test-resources/compress-pbzip2/install.sh index a5cf7c8..4870c46 100644 --- a/pts/test-resources/compress-pbzip2/install.sh +++ b/pts/test-resources/compress-pbzip2/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf bzip2-1.0.5.tar.gz tar -xvf pbzip2-1.0.2.tar.gz cd bzip2-1.0.5/ diff --git a/pts/test-resources/doom3/install.sh b/pts/test-resources/doom3/install.sh index f8b7694..61c0e63 100755 --- a/pts/test-resources/doom3/install.sh +++ b/pts/test-resources/doom3/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - # Config File cat > doom3-pts.cfg <<'EOT' unbindall
diff --git a/pts/test-resources/encode-flac/install.sh b/pts/test-resources/encode-flac/install.sh index ed0f1e3..645e0fd 100644 --- a/pts/test-resources/encode-flac/install.sh +++ b/pts/test-resources/encode-flac/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - if [ ! -f ../pts-shared/pts-trondheim-2.wav ] then tar -xvf ../pts-shared/pts-trondheim-wav-2.tar.gz -C ../pts-shared/ diff --git a/pts/test-resources/encode-mp3/install.sh b/pts/test-resources/encode-mp3/install.sh index 2c20ed2..be80d1e 100644 --- a/pts/test-resources/encode-mp3/install.sh +++ b/pts/test-resources/encode-mp3/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - if [ ! -f ../pts-shared/pts-trondheim-2.wav ] then tar -xvf ../pts-shared/pts-trondheim-wav-2.tar.gz -C ../pts-shared/ diff --git a/pts/test-resources/encode-ogg/install.sh b/pts/test-resources/encode-ogg/install.sh index beac3b0..2cbb2a9 100644 --- a/pts/test-resources/encode-ogg/install.sh +++ b/pts/test-resources/encode-ogg/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - if [ ! -f ../pts-shared/pts-trondheim-2.wav ] then tar -xvf ../pts-shared/pts-trondheim-wav-2.tar.gz -C ../pts-shared/ diff --git a/pts/test-resources/espeak/install.sh b/pts/test-resources/espeak/install.sh index b7b0835..1be0221 100644 --- a/pts/test-resources/espeak/install.sh +++ b/pts/test-resources/espeak/install.sh @@ -1,6 +1,5 @@ #!/bin/sh -cd $1 THIS_DIR=$(pwd) unzip -o espeak-1.37-source.zip cd espeak-1.37-source/src/ diff --git a/pts/test-resources/etqw-demo/install.sh b/pts/test-resources/etqw-demo/install.sh index ebc85c3..d64c304 100755 --- a/pts/test-resources/etqw-demo/install.sh +++ b/pts/test-resources/etqw-demo/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - unzip -o ETQW-demo2-client-full.r1.x86.run echo "#!/bin/sh diff --git a/pts/test-resources/etqw/install.sh b/pts/test-resources/etqw/install.sh index 8a008cf..e4e5dbe 100755 --- a/pts/test-resources/etqw/install.sh +++ b/pts/test-resources/etqw/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - unzip -o ETQW-client-1.5-full.x86.run echo "#!/bin/sh diff --git a/pts/test-resources/fract/install.sh b/pts/test-resources/fract/install.sh index a4dcee8..d6e795f 100644 --- a/pts/test-resources/fract/install.sh +++ b/pts/test-resources/fract/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -jxvf fract-1.07b.tar.bz2 cp fract-scene.h.patch fract-1.07b/ cd fract-1.07b/ diff --git a/pts/test-resources/glmark/install.sh b/pts/test-resources/glmark/install.sh index b9ca281..2ac38ef 100644 --- a/pts/test-resources/glmark/install.sh +++ b/pts/test-resources/glmark/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf GLMark-0.5.2.tar.gz cd GLMark-0.5.2/ diff --git a/pts/test-resources/gnupg/install.sh b/pts/test-resources/gnupg/install.sh index 61afd19..03b4a0d 100644 --- a/pts/test-resources/gnupg/install.sh +++ b/pts/test-resources/gnupg/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - THIS_DIR=$(pwd) mkdir $THIS_DIR/gnupg_ diff --git a/pts/test-resources/gtkperf/install.sh b/pts/test-resources/gtkperf/install.sh index f152c8c..d17d411 100755 --- a/pts/test-resources/gtkperf/install.sh +++ b/pts/test-resources/gtkperf/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - THIS_DIR=$(pwd) mkdir $THIS_DIR/gtkperf_env diff --git a/pts/test-resources/hdparm-read/install.sh b/pts/test-resources/hdparm-read/install.sh index 44c90f1..9051627 100755 --- a/pts/test-resources/hdparm-read/install.sh +++ b/pts/test-resources/hdparm-read/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - echo "#!/bin/sh echo \"Root permission needed to run hdparm benchmark.\" gksudo -w hdparm \$@" > hdparm-su diff --git a/pts/test-resources/iozone/install.sh b/pts/test-resources/iozone/install.sh index 65b3ad2..50f65db 100644 --- a/pts/test-resources/iozone/install.sh +++ b/pts/test-resources/iozone/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf iozone3_291.tar cd iozone3_291/src/current/ diff --git a/pts/test-resources/java-scimark2/install.sh b/pts/test-resources/java-scimark2/install.sh index ad1e4db..285e3c7 100644 --- a/pts/test-resources/java-scimark2/install.sh +++ b/pts/test-resources/java-scimark2/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - unzip -o scimark2lib.zip echo "#!/bin/sh diff --git a/pts/test-resources/md-gromacs/install.sh b/pts/test-resources/md-gromacs/install.sh index 491f218..c343439 100644 --- a/pts/test-resources/md-gromacs/install.sh +++ b/pts/test-resources/md-gromacs/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - THIS_DIR=$(pwd) mkdir $THIS_DIR/fftw_ mkdir $THIS_DIR/mpich2_ diff --git a/pts/test-resources/memory-bandwidth/install.sh b/pts/test-resources/memory-bandwidth/install.sh index 63ef1cc..12c1a7c 100644 --- a/pts/test-resources/memory-bandwidth/install.sh +++ b/pts/test-resources/memory-bandwidth/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - rm -rf bandwidth-0.13/ tar -xvf bandwidth-0.13.tar.gz diff --git a/pts/test-resources/nexuiz/install.sh b/pts/test-resources/nexuiz/install.sh index 95e2a1b..376d293 100755 --- a/pts/test-resources/nexuiz/install.sh +++ b/pts/test-resources/nexuiz/install.sh @@ -2,8 +2,6 @@ # Nexuiz 2.4.2 -cd $1 - if [ -x /usr/games/nexuiz -a -r /usr/share/games/nexuiz/data/music.pk3 ]; then cat > nexuiz <<'EOT' #!/bin/sh diff --git a/pts/test-resources/norsetto-shadow/install.sh b/pts/test-resources/norsetto-shadow/install.sh index 66114fe..13d4374 100644 --- a/pts/test-resources/norsetto-shadow/install.sh +++ b/pts/test-resources/norsetto-shadow/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - rm -rf shadow/ tar -xjf norsetto-shadow-01.tar.bz2 cd shadow/ diff --git a/pts/test-resources/openarena/install.sh b/pts/test-resources/openarena/install.sh index e1af49f..99a80b4 100755 --- a/pts/test-resources/openarena/install.sh +++ b/pts/test-resources/openarena/install.sh @@ -1,6 +1,5 @@ #!/bin/sh -cd $1 unzip -o oa076.zip cd openarena-0.7.6/baseoa tar -xvf ../../openarena-benchmark-files-2.tar.gz diff --git a/pts/test-resources/openssl/install.sh b/pts/test-resources/openssl/install.sh index 57f1c5c..d1ca3ed 100644 --- a/pts/test-resources/openssl/install.sh +++ b/pts/test-resources/openssl/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf openssl-0.9.8g.tar.gz cd openssl-0.9.8g/ ./config no-zlib diff --git a/pts/test-resources/pts-graph/install.sh b/pts/test-resources/pts-graph/install.sh index 3fe5684..15131dc 100644 --- a/pts/test-resources/pts-graph/install.sh +++ b/pts/test-resources/pts-graph/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf pts-graph-benchmark-1.tar.gz echo "#!/bin/sh diff --git a/pts/test-resources/quake4/install.sh b/pts/test-resources/quake4/install.sh index b2430f8..3a0cab8 100755 --- a/pts/test-resources/quake4/install.sh +++ b/pts/test-resources/quake4/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - chmod +x quake4-linux-1.4.2.x86.run ./quake4-linux-1.4.2.x86.run --noexec --target . diff --git a/pts/test-resources/ramspeed/install.sh b/pts/test-resources/ramspeed/install.sh index c84c57e..76b595f 100644 --- a/pts/test-resources/ramspeed/install.sh +++ b/pts/test-resources/ramspeed/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf ramspeed-2.5.1.tar.gz echo "#!/bin/sh diff --git a/pts/test-resources/render-bench/install.sh b/pts/test-resources/render-bench/install.sh index ee9a977..fcb7fc2 100644 --- a/pts/test-resources/render-bench/install.sh +++ b/pts/test-resources/render-bench/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - rm -rf render_bench/ tar -xvf render_bench.tar.gz cd render_bench/ diff --git a/pts/test-resources/sample-program/install.sh b/pts/test-resources/sample-program/install.sh index 0310480..f6170d0 100644 --- a/pts/test-resources/sample-program/install.sh +++ b/pts/test-resources/sample-program/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -cd $1 + g++ sample-pi-program.cpp -o sample-pi-program echo "#!/bin/sh diff --git a/pts/test-resources/scimark2/install.sh b/pts/test-resources/scimark2/install.sh index 6546ce9..f289f69 100644 --- a/pts/test-resources/scimark2/install.sh +++ b/pts/test-resources/scimark2/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - unzip -o scimark2_1c.zip -d scimark2_files cd scimark2_files/ g++ -o scimark2 -O *.c diff --git a/pts/test-resources/specviewperf10/install.sh b/pts/test-resources/specviewperf10/install.sh index 96ba74a..49096f8 100644 --- a/pts/test-resources/specviewperf10/install.sh +++ b/pts/test-resources/specviewperf10/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf SPECViewPerf10-Configure.tar.gz tar -xvf SPECViewperf10.tgz diff --git a/pts/test-resources/specviewperf9/install.sh b/pts/test-resources/specviewperf9/install.sh index 365d37d..0c4e838 100644 --- a/pts/test-resources/specviewperf9/install.sh +++ b/pts/test-resources/specviewperf9/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf SPECViewPerf10-Configure.tar.gz tar -xvf SPECViewperf9.0.3.tar.gz diff --git a/pts/test-resources/sqlite/install.sh b/pts/test-resources/sqlite/install.sh index 0ee3343..2533700 100644 --- a/pts/test-resources/sqlite/install.sh +++ b/pts/test-resources/sqlite/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf pts-sqlite-tests-1.tar.gz tar -xvf sqlite-3.5.9.tar.gz diff --git a/pts/test-resources/sunflow/install.sh b/pts/test-resources/sunflow/install.sh index 5a4bcdd..2a8c99e 100644 --- a/pts/test-resources/sunflow/install.sh +++ b/pts/test-resources/sunflow/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - unzip -o sunflow-bin-v0.07.2.zip echo "#!/bin/sh diff --git a/pts/test-resources/super-pi/install.sh b/pts/test-resources/super-pi/install.sh index c6379f0..983f74c 100755 --- a/pts/test-resources/super-pi/install.sh +++ b/pts/test-resources/super-pi/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf super_pi.tar.gz # make wrapper shell script for total line diff --git a/pts/test-resources/warsow/install.sh b/pts/test-resources/warsow/install.sh index 1902503..c11c0ba 100755 --- a/pts/test-resources/warsow/install.sh +++ b/pts/test-resources/warsow/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - tar -xvf pts-warsow-1.tar.gz unzip -o warsow_0.42_unified.zip cp -f pts-warsow-04.wd10 warsow_0.42_unified/basewsw/demos diff --git a/pts/test-resources/wine/install.sh b/pts/test-resources/wine/install.sh index c900921..9c339c1 100755 --- a/pts/test-resources/wine/install.sh +++ b/pts/test-resources/wine/install.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd $1 - if [ ! -f wine-git ] then git clone git://source.winehq.org/git/wine.git wine-git diff --git a/pts/test-resources/x11perf/install.sh b/pts/test-resources/x11perf/install.sh index a433d5d..2c476f7 100644 --- a/pts/test-resources/x11perf/install.sh +++ b/pts/test-resources/x11perf/install.sh @@ -1,6 +1,5 @@ #!/bin/sh -cd $1 tar -xjf x11perf-1.5.tar.bz2 cd x11perf-1.5/ ./configure diff --git a/pts/test-resources/xplane9/install.sh b/pts/test-resources/xplane9/install.sh index 62f840b..1e17928 100755 --- a/pts/test-resources/xplane9/install.sh +++ b/pts/test-resources/xplane9/install.sh @@ -1,6 +1,5 @@ #!/bin/sh -cd $1 tar -xjf X-Plane_900r3_timedemo.tar.bz2 echo "#!/bin/sh |