Summary
Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 5/21/13 15:49
Recent Commits
>
--git a/CHANGE-LOG b/CHANGE-LOG
index 0a0c577..4fa4efc 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -7,6 +7,7 @@ Phoronix Test Suite (Git)
- pts-core: For external dependency handling, treat Linaro as Ubuntu
- pts-core: Check for null distribution-specific external dependency package names
- pts-core: Formatting improvements to result-file-to-text output
+- pts-core: Add openssl-development as a new test external dependency
- phodevi: Support for reading the VirtualBox version of Beta/RC versions
- phodevi: Better support detection for Exynos ARM cores
- phodevi: Initial support for reading node power over IPMI
diff --git a/pts-core/external-test-dependencies/xml/arch-packages.xml b/pts-core/external-test-dependencies/xml/arch-packages.xml
index 8aacbdd..0ae53e1 100644
--- a/pts-core/external-test-dependencies/xml/arch-packages.xml
+++ b/pts-core/external-test-dependencies/xml/arch-packages.xml
@@ -36,6 +36,11 @@
<FileCheck>/usr/bin/X</FileCheck>
</Package>
<Package>
+ <GenericName>openssl-development</GenericName>
+ <PackageName>openssl</PackageName>
+ <FileCheck>/usr/include/openssl/</FileCheck>
+ </Package>
+ <Package>
<GenericName>bison</GenericName>
<PackageName>bison</PackageName>
<FileCheck>/usr/bin/bison</FileCheck>
diff --git a/pts-core/external-test-dependencies/xml/fedora-packages.xml b/pts-core/external-test-dependencies/xml/fedora-packages.xml
index e0da4fa..936e3cd 100644
--- a/pts-core/external-test-dependencies/xml/fedora-packages.xml
+++ b/pts-core/external-test-dependencies/xml/fedora-packages.xml
@@ -22,6 +22,11 @@
<FileCheck>/usr/lib/libglut.so OR /usr/lib64/libglut.so.3, /usr/include/GL/glut.h</FileCheck>
</Package>
<Package>
+ <GenericName>openssl-development</GenericName>
+ <PackageName>openssl-devel</PackageName>
+ <FileCheck>/usr/include/openssl/</FileCheck>
+ </Package>
+ <Package>
<GenericName>csh</GenericName>
<PackageName>tcsh</PackageName>
<FileCheck>/bin/tcsh OR /usr/bin/tcsh</FileCheck>
diff --git a/pts-core/external-test-dependencies/xml/generic-packages.xml b/pts-core/external-test-dependencies/xml/generic-packages.xml
index 3683875..b9bd270 100644
--- a/pts-core/external-test-dependencies/xml/generic-packages.xml
+++ b/pts-core/external-test-dependencies/xml/generic-packages.xml
@@ -40,6 +40,12 @@
<FileCheck>/usr/include/libpng12/png.h</FileCheck>
</Package>
<Package>
+ <GenericName>openssl-development</GenericName>
+ <Title>OpenSSL Development Files</Title>
+ <PossibleNames>libssl-dev, openssl-devel</PossibleNames>
+ <FileCheck>/usr/include/openssl/</FileCheck>
+ </Package>
+ <Package>
<GenericName>build-utilities</GenericName>
<Title>Compiler / Development Libraries</Title>
<PossibleNames>gcc</PossibleNames>
diff --git a/pts-core/external-test-dependencies/xml/gentoo-packages.xml b/pts-core/external-test-dependencies/xml/gentoo-packages.xml
index dc1b108..674b68b 100644
--- a/pts-core/external-test-dependencies/xml/gentoo-packages.xml
+++ b/pts-core/external-test-dependencies/xml/gentoo-packages.xml
@@ -21,6 +21,11 @@
<FileCheck>/usr/lib/libglut.so.3 OR /usr/lib64/libglut.so.3, /usr/include/GL/glut.h</FileCheck>
</Package>
<Package>
+ <GenericName>openssl-development</GenericName>
+ <PackageName>dev-libs/openssl</PackageName>
+ <FileCheck>/usr/include/openssl/</FileCheck>
+ </Package>
+ <Package>
<GenericName>cairo-development</GenericName>
<PackageName>x11-libs/cairo</PackageName>
<FileCheck>/usr/include/cairo/cairo.h</FileCheck>
diff --git a/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml b/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml
index 42a7c7d..7f463b0 100644
--- a/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml
+++ b/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml
@@ -21,6 +21,11 @@
<FileCheck>/usr/include/cairo/cairo.h</FileCheck>
</Package>
<Package>
+ <GenericName>openssl-development</GenericName>
+ <PackageName>openssl</PackageName>
+ <FileCheck>/usr/include/openssl/</FileCheck>
+ </Package>
+ <Package>
<GenericName>p7zip</GenericName>
<PackageName>p7zip</PackageName>
<FileCheck>/usr/bin/7za</FileCheck>
diff --git a/pts-core/external-test-dependencies/xml/opensuse-packages.xml b/pts-core/external-test-dependencies/xml/opensuse-packages.xml
index cbaae25..442eed6 100644
--- a/pts-core/external-test-dependencies/xml/opensuse-packages.xml
+++ b/pts-core/external-test-dependencies/xml/opensuse-packages.xml
@@ -22,6 +22,11 @@
<FileCheck>/usr/include/GL/glut.h</FileCheck>
</Package>
<Package>
+ <GenericName>openssl-development</GenericName>
+ <PackageName>openssl-devel</PackageName>
+ <FileCheck>/usr/include/openssl/</FileCheck>
+ </Package>
+ <Package>
<GenericName>csh</GenericName>
<PackageName>tcsh</PackageName>
<FileCheck>/bin/csh</FileCheck>
diff --git a/pts-core/external-test-dependencies/xml/ubuntu-packages.xml b/pts-core/external-test-dependencies/xml/ubuntu-packages.xml
index a98a174..0b3cffa 100644
--- a/pts-core/external-test-dependencies/xml/ubuntu-packages.xml
+++ b/pts-core/external-test-dependencies/xml/ubuntu-packages.xml
@@ -38,6 +38,11 @@
<FileCheck>/usr/include/libpng12/png.h</FileCheck>
</Package>
<Package>
+ <GenericName>openssl-development</GenericName>
+ <PackageName>libssl-dev</PackageName>
+ <FileCheck>/usr/include/openssl/sha.h</FileCheck>
+ </Package>
+ <Package>
<GenericName>build-utilities</GenericName>
<PackageName>build-essential autoconf</PackageName>
<FileCheck>/usr/share/build-essential</FileCheck>
diff --git a/pts-core/objects/nye_Xml/pts_test_nye_XmlReader.php b/pts-core/objects/nye_Xml/pts_test_nye_XmlReader.php
index 493f2ab..de00e95 100644
--- a/pts-core/objects/nye_Xml/pts_test_nye_XmlReader.php
+++ b/pts-core/objects/nye_Xml/pts_test_nye_XmlReader.php
@@ -98,7 +98,7 @@ class pts_test_nye_XmlReader extends nye_XmlReader
}
$test_extends = $this->getXmlValue('PhoronixTestSuite/TestProfile/Extends');
- if(!empty($test_extends))
+ if(!empty($test_extends) && PTS_IS_CLIENT)
{
$test_extends = pts_openbenchmarking::evaluate_string_to_qualifier($test_extends, true, 'test');
$test_below_parser = new pts_test_nye_XmlReader($test_extends);
<
Copyright © 2013 by Phoronix Media