diff options
author | Michael Larabel <michael@phx-laptop.(none)> | 2008-10-13 20:22:09 -0400 |
---|---|---|
committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-10-13 20:22:09 -0400 |
commit | fb1688bcb3d187293ac6a68de3356ca4e2ec542f (patch) | |
tree | 7996f455e55991ae64ed210bb85fc1a6b833de7f /pts/test-resources | |
parent | 827fe07527081a15db12472a20d2e199fe71cf40 (diff) | |
download | phoronix-test-suite-upstream-fb1688bcb3d187293ac6a68de3356ca4e2ec542f.tar.gz phoronix-test-suite-upstream-fb1688bcb3d187293ac6a68de3356ca4e2ec542f.tar.xz phoronix-test-suite-upstream-fb1688bcb3d187293ac6a68de3356ca4e2ec542f.zip |
pts: Many test profile updates
Diffstat (limited to 'pts/test-resources')
25 files changed, 72 insertions, 56 deletions
diff --git a/pts/test-resources/doom3/install.sh b/pts/test-resources/doom3/install.sh index 5a188a0..80e1446 100755 --- a/pts/test-resources/doom3/install.sh +++ b/pts/test-resources/doom3/install.sh @@ -154,18 +154,20 @@ chmod +x doom3-linux-1.3.1.1304.x86.run mv -f doom3-pts.cfg base/doom3-pts.cfg echo "#!/bin/sh -./bin/Linux/x86/doom.x86 \$@ | grep fps" > doom3 +./bin/Linux/x86/doom.x86 \$@ > \$LOG_FILE +cat \$LOG_FILE | grep fps" > doom3 chmod +x doom3 if [ -f doom3-game-files.tar ] then tar -k -C $1/base -xvf $1/doom3-game-files.tar + else + echo "Doom 3 Game Files (*.pk4) Must Be Copied Into $1/base" fi if [ -f doom3-key.tar ] then tar -xvf doom3-key.tar + else + echo "Copy Your Game Key File To $HOME/.doom3/base/doomkey" fi -echo "Doom 3 Game Files (*.pk4) Must Be Copied Into $1/base" -echo "Also Copy Your Game Key File To $HOME/.doom3/base/doomkey (If Not Already There)" - diff --git a/pts/test-resources/doom3/parse-results.php b/pts/test-resources/doom3/parse-results.php index 6cf5b34..a538b81 100644 --- a/pts/test-resources/doom3/parse-results.php +++ b/pts/test-resources/doom3/parse-results.php @@ -1,5 +1,5 @@ <?php - -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "seconds =") + 9); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "seconds =") + 9); echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "fps"))); ?> diff --git a/pts/test-resources/et/install.sh b/pts/test-resources/et/install.sh index c8090f3..1e88a42 100755 --- a/pts/test-resources/et/install.sh +++ b/pts/test-resources/et/install.sh @@ -10,6 +10,5 @@ mv -f railgun.dm_83 et_/etmain/demos/ echo "#!/bin/sh cd et_/ -./bin/Linux/x86/et.x86 \$@ 2>&1 | grep fps -" > et +./bin/Linux/x86/et.x86 \$@ > \$LOG_FILE 2>&1" > et chmod +x et diff --git a/pts/test-resources/et/parse-results.php b/pts/test-resources/et/parse-results.php index f75e04d..af2df8c 100755 --- a/pts/test-resources/et/parse-results.php +++ b/pts/test-resources/et/parse-results.php @@ -1,6 +1,8 @@ <?php -$BENCHMARK_RESULTS = trim(substr($argv[1], 0, strrpos($argv[1], " fps"))); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = trim(substr($log_file, 0, strrpos($log_file, " fps"))); $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, strrpos($BENCHMARK_RESULTS, ' '))); echo $BENCHMARK_RESULTS; + ?> diff --git a/pts/test-resources/etqw-demo/install.sh b/pts/test-resources/etqw-demo/install.sh index a3b489c..5a91fa5 100755 --- a/pts/test-resources/etqw-demo/install.sh +++ b/pts/test-resources/etqw-demo/install.sh @@ -4,7 +4,8 @@ unzip -o ETQW-demo2-client-full.r1.x86.run echo "#!/bin/sh cd data/ -./etqw.x86 \$@ | grep fps" > etqw +./etqw.x86 \$@ > \$LOG_FILE 2>&1 +cat \$LOG_FILE | grep fps" > etqw chmod +x etqw tar -jxvf etqw-demo-files-3.tar.bz2 diff --git a/pts/test-resources/etqw-demo/parse-results.php b/pts/test-resources/etqw-demo/parse-results.php index 6cf5b34..a538b81 100644 --- a/pts/test-resources/etqw-demo/parse-results.php +++ b/pts/test-resources/etqw-demo/parse-results.php @@ -1,5 +1,5 @@ <?php - -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "seconds =") + 9); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "seconds =") + 9); echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "fps"))); ?> diff --git a/pts/test-resources/etqw/install.sh b/pts/test-resources/etqw/install.sh index c8872aa..5699ed4 100755 --- a/pts/test-resources/etqw/install.sh +++ b/pts/test-resources/etqw/install.sh @@ -4,7 +4,8 @@ unzip -o ETQW-client-1.5-full.x86.run echo "#!/bin/sh cd data -./etqw.x86 \$@ | grep fps" > etqw +./etqw.x86 \$@ > \$LOG_FILE 2>&1 +cat \$LOG_FILE | grep fps" > etqw chmod +x etqw tar -jxvf etqw-files-3.tar.bz2 @@ -52,7 +53,8 @@ fi if [ -f etqw-game-files.tar ] then tar -k -C $1/data/base -xvf $1/etqw-game-files.tar -fi -echo "copy ET:QW Game Files (*.mega) in bases/megatextures + else + echo "copy ET:QW Game Files (*.mega) in bases/megatextures copy ET:QW Game Files(*.pk4) in bases" +fi diff --git a/pts/test-resources/etqw/parse-results.php b/pts/test-resources/etqw/parse-results.php index 6cf5b34..7c7e09c 100644 --- a/pts/test-resources/etqw/parse-results.php +++ b/pts/test-resources/etqw/parse-results.php @@ -1,5 +1,6 @@ <?php -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "seconds =") + 9); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "seconds =") + 9); echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "fps"))); ?> diff --git a/pts/test-resources/nexuiz/install.sh b/pts/test-resources/nexuiz/install.sh index 0d5f69f..242fe17 100755 --- a/pts/test-resources/nexuiz/install.sh +++ b/pts/test-resources/nexuiz/install.sh @@ -9,10 +9,11 @@ echo "#!/bin/sh cd Nexuiz_/ if [ \$OS_TYPE = \"MacOSX\" ] then - ./Nexuiz.app/Contents/MacOS/nexuiz-osx-agl +exec normal.cfg \$@ | grep fps + ./Nexuiz.app/Contents/MacOS/nexuiz-osx-agl +exec normal.cfg \$@ > \$LOG_FILE 2>&1 else - ./nexuiz-linux-glx.sh +exec normal.cfg \$@ | grep fps -fi" > nexuiz + ./nexuiz-linux-glx.sh +exec normal.cfg \$@ > \$LOG_FILE 2>&1 +fi +cat \$LOG_FILE | grep fps" > nexuiz chmod +x nexuiz cd Nexuiz_/ diff --git a/pts/test-resources/nexuiz/parse-results.php b/pts/test-resources/nexuiz/parse-results.php index c7e1a6c..34fffa2 100644 --- a/pts/test-resources/nexuiz/parse-results.php +++ b/pts/test-resources/nexuiz/parse-results.php @@ -1,6 +1,6 @@ <?php - -$BENCHMARK_RESULTS = trim(substr($argv[1], strrpos($argv[1], "min/avg/max:") + 12)); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = trim(substr($log_file, strrpos($log_file, "min/avg/max:") + 12)); $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, strpos($BENCHMARK_RESULTS, ' '))); $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, ' '))); echo $BENCHMARK_RESULTS; diff --git a/pts/test-resources/openarena/install.sh b/pts/test-resources/openarena/install.sh index ab8676e..6fb42d6 100755 --- a/pts/test-resources/openarena/install.sh +++ b/pts/test-resources/openarena/install.sh @@ -10,10 +10,11 @@ cd openarena-0.8.0/ case \$OS_ARCH in \"x86_64\" ) - ./openarena.x86_64 \$@ 2>&1 | grep fps + ./openarena.x86_64 \$@ > \$LOG_FILE 2>&1 ;; * ) - ./openarena.i386 \$@ 2>&1 | grep fps + ./openarena.i386 \$@ > \$LOG_FILE 2>&1 ;; -esac" > openarena +esac +cat \$LOG_FILE | grep fps" > openarena chmod +x openarena diff --git a/pts/test-resources/openarena/parse-results.php b/pts/test-resources/openarena/parse-results.php index f75e04d..c17c021 100644 --- a/pts/test-resources/openarena/parse-results.php +++ b/pts/test-resources/openarena/parse-results.php @@ -1,6 +1,6 @@ <?php - -$BENCHMARK_RESULTS = trim(substr($argv[1], 0, strrpos($argv[1], " fps"))); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = trim(substr($log_file, 0, strrpos($log_file, " fps"))); $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, strrpos($BENCHMARK_RESULTS, ' '))); echo $BENCHMARK_RESULTS; ?> diff --git a/pts/test-resources/padman/install.sh b/pts/test-resources/padman/install.sh index fd7353e..4e190a3 100755 --- a/pts/test-resources/padman/install.sh +++ b/pts/test-resources/padman/install.sh @@ -47,10 +47,11 @@ cd wop-install/ case \$OS_ARCH in \"x86_64\" ) - ./WoP32 \$@ 2>&1 | grep fps + ./WoP32 \$@ > \$LOG_FILE 2>&1 ;; * ) - ./WoP64 \$@ 2>&1 | grep fps + ./WoP64 \$@ > \$LOG_FILE 2>&1 ;; -esac" > padman +esac +cat \$LOG_FILE | grep fps" > padman chmod +x padman diff --git a/pts/test-resources/padman/parse-results.php b/pts/test-resources/padman/parse-results.php index f75e04d..c17c021 100755 --- a/pts/test-resources/padman/parse-results.php +++ b/pts/test-resources/padman/parse-results.php @@ -1,6 +1,6 @@ <?php - -$BENCHMARK_RESULTS = trim(substr($argv[1], 0, strrpos($argv[1], " fps"))); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = trim(substr($log_file, 0, strrpos($log_file, " fps"))); $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, strrpos($BENCHMARK_RESULTS, ' '))); echo $BENCHMARK_RESULTS; ?> diff --git a/pts/test-resources/quake4/install.sh b/pts/test-resources/quake4/install.sh index 85650d9..23430f1 100755 --- a/pts/test-resources/quake4/install.sh +++ b/pts/test-resources/quake4/install.sh @@ -6,7 +6,8 @@ chmod +x quake4-linux-1.4.2.x86.run chmod +x bin/Linux/x86/quake4.x86 echo "#!/bin/sh -./bin/Linux/x86/quake4.x86 \$@ | grep fps" > quake4 +./bin/Linux/x86/quake4.x86 \$@ > \$LOG_FILE 2>&1 +cat \$LOG_FILE | grep fps" > quake4 chmod +x quake4 tar -xvf quake4-pts-demo-1.tar.gz @@ -16,13 +17,13 @@ mv -f pts.demo q4base/demos/pts.demo if [ -f quake4-game-files.tar ] then tar -k -C $1/q4base -xvf $1/quake4-game-files.tar + else + echo "Quake 4 Game Files (*.pk4) Must Be Copied Into $1/q4base" fi if [ -f quake4-key.tar ] then tar -xvf quake4-key.tar + else + echo "Copy Your Game Key File To $HOME/.quake4/q4base/quake4key (If Not Already There)" fi - -echo "Quake 4 Game Files (*.pk4) Must Be Copied Into $1/q4base" -echo "Also Copy Your Game Key File To $HOME/.quake4/q4base/quake4key (If Not Already There)" - diff --git a/pts/test-resources/quake4/parse-results.php b/pts/test-resources/quake4/parse-results.php index 6cf5b34..a538b81 100644 --- a/pts/test-resources/quake4/parse-results.php +++ b/pts/test-resources/quake4/parse-results.php @@ -1,5 +1,5 @@ <?php - -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "seconds =") + 9); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "seconds =") + 9); echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "fps"))); ?> diff --git a/pts/test-resources/unigine-sanctuary/install.sh b/pts/test-resources/unigine-sanctuary/install.sh index 7033c85..f5269c7 100755 --- a/pts/test-resources/unigine-sanctuary/install.sh +++ b/pts/test-resources/unigine-sanctuary/install.sh @@ -5,6 +5,7 @@ tar -jxvf Unigine_Sanctuary2_Linux.tar.bz2 echo "#!/bin/sh cd Unigine_Sanctuary2_Linux/ export LD_LIBRARY_PATH=bin/:\$LD_LIBRARY_PATH -./bin/main_x86 \$@ 2>&1 | grep FPS" > unigine-sanctuary +./bin/main_x86 \$@ > \$LOG_FILE 2>&1 +cat \$LOG_FILE | grep FPS" > unigine-sanctuary chmod +x unigine-sanctuary diff --git a/pts/test-resources/unigine-sanctuary/parse-results.php b/pts/test-resources/unigine-sanctuary/parse-results.php index 35a388d..773c290 100644 --- a/pts/test-resources/unigine-sanctuary/parse-results.php +++ b/pts/test-resources/unigine-sanctuary/parse-results.php @@ -1,5 +1,5 @@ <?php - -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "FPS:") + 5); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "FPS:") + 5); echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n"))); ?> diff --git a/pts/test-resources/unigine-tropics/install.sh b/pts/test-resources/unigine-tropics/install.sh index c72cf69..183f262 100755 --- a/pts/test-resources/unigine-tropics/install.sh +++ b/pts/test-resources/unigine-tropics/install.sh @@ -5,6 +5,7 @@ tar -jxvf Unigine_Tropics_Linux.tar.bz2 echo "#!/bin/sh cd Unigine_Tropics_Linux/ export LD_LIBRARY_PATH=bin/:\$LD_LIBRARY_PATH -./bin/main_x86 \$@ 2>&1 | grep FPS" > unigine-tropics +./bin/main_x86 \$@ > \$LOG_FILE 2>&1 +cat \$LOG_FILE | grep FPS" > unigine-tropics chmod +x unigine-tropics diff --git a/pts/test-resources/unigine-tropics/parse-results.php b/pts/test-resources/unigine-tropics/parse-results.php index 35a388d..773c290 100644 --- a/pts/test-resources/unigine-tropics/parse-results.php +++ b/pts/test-resources/unigine-tropics/parse-results.php @@ -1,5 +1,5 @@ <?php - -$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "FPS:") + 5); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "FPS:") + 5); echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n"))); ?> diff --git a/pts/test-resources/urbanterror/install.sh b/pts/test-resources/urbanterror/install.sh index 1280ba5..caab4d0 100755 --- a/pts/test-resources/urbanterror/install.sh +++ b/pts/test-resources/urbanterror/install.sh @@ -19,15 +19,16 @@ cd UrbanTerror_/ if [ \$OS_TYPE = \"MacOSX\" ] then mkdir -p ~/Library/Application\ Support/Quake3 - ./ioUrbanTerror.app/Contents/MacOS/ioUrbanTerror.ub \$@ 2>&1 | grep fps + ./ioUrbanTerror.app/Contents/MacOS/ioUrbanTerror.ub \$@ > \$LOG_FILE 2>&1 else case \$OS_ARCH in \"x86_64\" ) - ./ioUrbanTerror.x86_64 \$@ 2>&1 | grep fps + ./ioUrbanTerror.x86_64 \$@ > \$LOG_FILE 2>&1 ;; * ) - ./ioUrbanTerror.i386 \$@ 2>&1 | grep fps + ./ioUrbanTerror.i386 \$@ > \$LOG_FILE 2>&1 ;; esac -fi" > urbanterror +fi +cat \$LOG_FILE | grep fps" > urbanterror chmod +x urbanterror diff --git a/pts/test-resources/urbanterror/parse-results.php b/pts/test-resources/urbanterror/parse-results.php index f75e04d..c17c021 100755 --- a/pts/test-resources/urbanterror/parse-results.php +++ b/pts/test-resources/urbanterror/parse-results.php @@ -1,6 +1,6 @@ <?php - -$BENCHMARK_RESULTS = trim(substr($argv[1], 0, strrpos($argv[1], " fps"))); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = trim(substr($log_file, 0, strrpos($log_file, " fps"))); $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, strrpos($BENCHMARK_RESULTS, ' '))); echo $BENCHMARK_RESULTS; ?> diff --git a/pts/test-resources/ut2004-demo/install.sh b/pts/test-resources/ut2004-demo/install.sh index f03b1b7..52b6640 100755 --- a/pts/test-resources/ut2004-demo/install.sh +++ b/pts/test-resources/ut2004-demo/install.sh @@ -21,7 +21,8 @@ mv -f System/* System/ echo "#!/bin/sh cd System/ -./ut2004-bin \$@" > ut2004-demo +./ut2004-bin \$@ > \$LOG_FILE 2>&1 +cat \$LOG_FILE" > ut2004-demo chmod +x ut2004-demo echo "causeevent flyby diff --git a/pts/test-resources/warsow/install.sh b/pts/test-resources/warsow/install.sh index 5e691ac..6f4a14b 100755 --- a/pts/test-resources/warsow/install.sh +++ b/pts/test-resources/warsow/install.sh @@ -10,14 +10,15 @@ chmod +x warsow.i386 cd .. echo "#!/bin/sh +rm -f .warsow/basewsw/1.log cd warsow_0.42_unified/ case \$OS_ARCH in \"x86_64\" ) - ./warsow.x86_64 +logconsole 1 \$@ | grep seconds + ./warsow.x86_64 \$@ > \$LOG_FILE 2>&1 ;; * ) - ./warsow.i386 +logconsole 1 \$@ | grep seconds + ./warsow.i386 \$@ > \$LOG_FILE 2>&1 ;; esac -cat ../.warsow/basewsw/1.log | grep seconds" > warsow +cat \$LOG_FILE | grep seconds" > warsow chmod +x warsow diff --git a/pts/test-resources/warsow/parse-results.php b/pts/test-resources/warsow/parse-results.php index 05e160a..91c69b1 100644 --- a/pts/test-resources/warsow/parse-results.php +++ b/pts/test-resources/warsow/parse-results.php @@ -1,6 +1,6 @@ <?php - -$BENCHMARK_RESULTS = trim(substr($argv[1], strrpos($argv[1], "seconds:") + 9)); +$log_file = file_get_contents(getenv("LOG_FILE")); +$BENCHMARK_RESULTS = trim(substr($log_file, strrpos($log_file, "seconds:") + 9)); $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "fps"))); echo $BENCHMARK_RESULTS; ?> |