Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Fri 5/17/13 22:52
Recent Commits
>
--git a/CHANGE-LOG b/CHANGE-LOG
index 64228d6..cb7d9b3 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -62,6 +62,7 @@ Phoronix Test Suite (Git)
- pts: Add idle-power-usage test profile
- pts: Add battery-power-usage test profile
- pts: Add himeno test profile for the Himeno pressure solver benchmark
+- pts: Update mplayer-base test profile against MPlayer 2009-11-28 SVN snapshot
Phoronix Test Suite 2.2.0 "Bardu"
November 16, 2009
diff --git a/pts-core/library/pts-functions_types.php b/pts-core/library/pts-functions_types.php
index 58856a3..cb956fe 100644
--- a/pts-core/library/pts-functions_types.php
+++ b/pts-core/library/pts-functions_types.php
@@ -472,11 +472,13 @@ function pts_virtual_suite_tests($object)
{
array_push($contained_tests, $test);
}
+ break;
case "TYPE_VIRT_PREV_SAVE_IDENTIFIER":
foreach(pts_to_array(pts_read_assignment("PREV_SAVE_RESULTS_IDENTIFIER")) as $test)
{
array_push($contained_tests, $test);
}
+ break;
}
if(count($contained_tests) > 0)
diff --git a/pts-core/library/pts-includes-run_setup.php b/pts-core/library/pts-includes-run_setup.php
index a6e3009..86e2956 100644
--- a/pts-core/library/pts-includes-run_setup.php
+++ b/pts-core/library/pts-includes-run_setup.php
@@ -268,6 +268,9 @@ function pts_global_auto_tags($extra_attr = null)
case 2:
array_push($tags_array, "Dual Core");
break;
+ case 3:
+ array_push($tags_array, "Triple Core");
+ break;
case 4:
array_push($tags_array, "Quad Core");
break;
@@ -299,16 +302,12 @@ function pts_global_auto_tags($extra_attr = null)
array_push($tags_array, "NVIDIA");
}
- if(phodevi::read_property("system", "kernel-architecture") == "x86_64" && IS_LINUX)
+ if(phodevi::read_property("system", "kernel-architecture") == "x86_64")
{
- array_push($tags_array, "64-bit Linux");
+ array_push($tags_array, "64-bit");
}
- $os = phodevi::read_property("system", "operating-system");
- if($os != "Unknown")
- {
- array_push($tags_array, $os);
- }
+ array_push($tags_array, phodevi::read_property("system", "operating-system"));
return implode(", ", $tags_array);
}
diff --git a/pts/base-test-resources/mplayer-base/downloads.xml b/pts/base-test-resources/mplayer-base/downloads.xml
index 5652ec1..8ade3b7 100644
--- a/pts/base-test-resources/mplayer-base/downloads.xml
+++ b/pts/base-test-resources/mplayer-base/downloads.xml
@@ -1,9 +1,9 @@
<PhoronixTestSuite>
<Downloads>
<Package>
- <URL>http://www.phoronix-test-suite.com/benchmark-files/mplayer-2009-06-04.tar.bz2, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/mplayer-2009-06-04.tar.bz2</URL>
- <MD5>39adb549f49bb50d5467993c978fcd88</MD5>
- <FileSize>15191483</FileSize>
+ <URL>http://www.phoronix-test-suite.com/benchmark-files/mplayer-2009-11-28.tar.bz2, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/mplayer-2009-11-28.tar.bz2</URL>
+ <MD5>ccb1dfa3e2a50726e688b825aac0f7e8</MD5>
+ <FileSize>16893928</FileSize>
</Package>
</Downloads>
</PhoronixTestSuite>
diff --git a/pts/base-test-resources/mplayer-base/install.sh b/pts/base-test-resources/mplayer-base/install.sh
index b5ec3c0..d46e6b5 100755
--- a/pts/base-test-resources/mplayer-base/install.sh
+++ b/pts/base-test-resources/mplayer-base/install.sh
@@ -1,10 +1,10 @@
#!/bin/sh
-tar -xjf mplayer-2009-06-04.tar.bz2
+tar -xjf mplayer-2009-11-28.tar.bz2
mkdir $HOME/mplayer_
-cd mplayer-checkout-2009-06-04/
+cd mplayer-2009-11-28/
if [ -f "/usr/include/vdpau/vdpau.h" ]
then
@@ -19,7 +19,7 @@ make -j $NUM_CPU_JOBS
make install
cd ..
-rm -rf mplayer-checkout-2009-06-04/
+rm -rf mplayer-2009-11-28/
rm -rf mplayer_/share/
ln -s mplayer_/bin/mplayer mplayer
diff --git a/pts/test-resources/john-the-ripper/install.sh b/pts/test-resources/john-the-ripper/install.sh
index e449765..151acde 100755
--- a/pts/test-resources/john-the-ripper/install.sh
+++ b/pts/test-resources/john-the-ripper/install.sh
@@ -4,13 +4,18 @@ tar -xvf john-1.7.3.1.tar.gz
cd john-1.7.3.1/src/
case $OS_TYPE in
- "MacOSX" )
+ "MacOSX")
make macosx-x86-64
;;
- "Solaris" )
- make solaris-x86-64-cc
+ "Solaris")
+ if [ $OS_ARCH = "x86_64" ]
+ then
+ make solaris-x86-64-gcc
+ else
+ make solaris-x86-sse2-gcc
+ fi
;;
- "BSD" )
+ "BSD")
if [ $OS_ARCH = "x86_64" ]
then
make freebsd-x86-64
@@ -18,7 +23,7 @@ case $OS_TYPE in
make freebsd-x86-sse2
fi
;;
- * )
+ *)
if [ $OS_ARCH = "x86_64" ]
then
make linux-x86-
Copyright © 2013 by Phoronix Media