This fixes various issues with the profile:
Code:
diff --git a/pts/test-profiles/warsow.xml b/pts/test-profiles/warsow.xml index bfcea27..3621097 100644 --- a/pts/test-profiles/warsow.xml +++ b/pts/test-profiles/warsow.xml @@ -1,10 +1,10 @@ <PhoronixTestSuite> <TestProfile> - <Version>0.3</Version> + <Version>0.4</Version> <TestType>Graphics</TestType> <ApplicationType>Game</ApplicationType> <License>FREE</License> - <Status>BROKEN</Status> + <Status>VERIFIED</Status> <Maintainer>Michael Larabel</Maintainer> </TestProfile> <TestInformation> @@ -13,12 +13,13 @@ <TimesToRun>1</TimesToRun> <ResultScale>Average FPS</ResultScale> <Proportion>HIB</Proportion> - <PreRunMessage>Due to a limitation of Warsow, once the benchmark has completed you must manually exit this game so that the Phoronix Test Suite can continue.</PreRunMessage> <Description>This is a benchmark of Warsow, a popular open-source first-person shooter.</Description> + <DownloadSize>186</DownloadSize> + <EnvironmentSize>192</EnvironmentSize> </TestInformation> <TestSettings> <Default> - <Arguments>+timedemo 1 +demo pts-warsow-04</Arguments> + <Arguments>+timedemo 1 +demo pts-warsow-04 +next "quit"</Arguments> </Default> </TestSettings> </PhoronixTestSuite> diff --git a/pts/test-resources/warsow/install.sh b/pts/test-resources/warsow/install.sh index 46578b8..3e10d34 100755 --- a/pts/test-resources/warsow/install.sh +++ b/pts/test-resources/warsow/install.sh @@ -7,15 +7,16 @@ cp pts-warsow-04.wd10 warsow_0.42_unified/basewsw/demos cd warsow_0.42_unified/ chmod +x warsow.x86_64 chmod +x warsow.i386 +cd .. echo "#!/bin/sh cd warsow_0.42_unified/ case \`uname -m\` in \"x86_64\" ) - ./warsow.x86_64 \$@ | grep fps + ./warsow.x86_64 \$@ | grep seconds ;; * ) - ./warsow.i386 \$@ | grep fps + ./warsow.i386 \$@ | grep seconds ;; esac" > warsow chmod +x warsow diff --git a/pts/test-resources/warsow/parse-results.php b/pts/test-resources/warsow/parse-results.php index a1686a3..05e160a 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))); +$BENCHMARK_RESULTS = trim(substr($argv[1], strrpos($argv[1], "seconds:") + 9)); $BENCHMARK_RESULTS = trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "fps"))); echo $BENCHMARK_RESULTS; ?>
Comment