>
--git a/CHANGE-LOG b/CHANGE-LOG
index db9a3e1..0dd54d1 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -18,7 +18,10 @@ Phoronix Test Suite (git)
- Improved video card detection (use GL renderer and use lspci now only for fallback)
- Add Super PI profile (Thanks to Pekka Panula)
- Compress-gzip update (Thanks to Kano)
+- Other updated scripts (Thanks to Kano)
+- Doom 3 profile now working
- Improved distribution detection
+- New results viewer (work in progress)
- Other small fixes
Phoronix Test Suite 0.1.0
diff --git a/pts-core/functions/pts-functions_linux.php b/pts-core/functions/pts-functions_linux.php
index 17ecbf1..7ade688 100644
--- a/pts-core/functions/pts-functions_linux.php
+++ b/pts-core/functions/pts-functions_linux.php
@@ -153,7 +153,7 @@ function graphics_processor_string()
else
$info = "";
- if(empty($info) || $info == "Mesa GLX Indirect")
+ if(empty($info) || strpos($info, "Mesa GLX") !== FALSE || strpos($info, "Mesa DRI") !== FALSE)
$info = parse_lspci_output("VGA compatible controller:");
return $info;
diff --git a/pts-core/pts-results-viewer/old.css b/pts-core/pts-results-viewer/old.css
new file mode 100644
index 0000000..fa055c9
--- /dev/null
+++ b/pts-core/pts-results-viewer/old.css
@@ -0,0 +1,96 @@
+body
+{
+ text-align: left;
+ margin: 0;
+ padding: 0;
+ font-family: arial, helvetica, sans-serif;
+ font-size: 14px;
+ background-color: #3b433a;
+}
+div#pts_container
+{
+ width: 960px;
+ margin: 0 auto;
+ text-align: left;
+ color: #FFF;
+ overflow: hidden;
+ background-color: #222;
+ border: solid #000;
+ border-width: 0 1px 1px;
+}
+div#pts_container a
+{
+ color: #FFF;
+}
+div#pts_logo
+{
+ margin: 0;
+ width: 960px;
+ height: 70px;
+ background: #222 url(phoronix-test-suite.gif) no-repeat;
+ border: solid #000;
+ border-width: 0 0 1px 0;
+}
+div#pts_benchmark_main_header
+{
+ color: #FFF;
+ font-size: 36px;
+ font-weight: bold;
+ padding: 5px 0 5px 15px;
+}
+div#pts_description_area
+{
+ padding: 0 0 5px;
+}
+div#pts_benchmark_area
+{
+ background-color: #FFF;
+ padding: 15px 10px;
+ color: #000;
+ overflow: hidden;
+}
+div.pts_benchmark_descriptor
+{
+ color: #EFEFEF;
+ padding: 5px 20px;
+}
+div.pts_area_box
+{
+ background-color: #66695B;
+ color: #EFEFEF;
+ padding: 1px 5px 0;
+ border: solid #000 1px;
+}
+div.pts_benchmark_bar
+{
+ background-color: #2b6b29;
+ color: #FFF;
+ padding: 4px;
+ border: solid #000 1px;
+ clear: both;
+}
+span.pts_benchmark_bar_header
+{
+ font-size: 18px;
+ font-weight: bold;
+}
+span.pts_benchmark_bar_version
+{
+ vertical-align: super;
+ padding-left: 5px;
+ font-size: 10px;
+}
+div.pts_benchmark_text
+{
+ padding: 50px 15px 15px;
+ float: left;
+ overflow: hidden;
+}
+div.pts_benchmark_img_area
+{
+ padding: 15px 0 15px 35px;
+ float: right;
+ overflow: hidden;
+ height: 100%;
+ vertical-align: middle;
+}
diff --git a/pts-core/pts-results-viewer/pts-viewer.css b/pts-core/pts-results-viewer/pts-viewer.css
index fa055c9..ddd1618 100644
--- a/pts-core/pts-results-viewer/pts-viewer.css
+++ b/pts-core/pts-results-viewer/pts-viewer.css
@@ -1,69 +1,153 @@
body
{
- text-align: left;
+ text-align: center;
margin: 0;
padding: 0;
font-family: arial, helvetica, sans-serif;
- font-size: 14px;
- background-color: #3b433a;
+ font-size: 13px;
+ background-color: #FFF;
+ color: #000;
}
-div#pts_container
+a
{
- width: 960px;
- margin: 0 auto;
- text-align: left;
+ color: #3B433A;
+}
+div#pts_header_top
+{
+ width: 100%;
+ margin: 0;
color: #FFF;
- overflow: hidden;
background-color: #222;
border: solid #000;
- border-width: 0 1px 1px;
+ border-width: 0 0 1px;
+}
+div#pts_header_top_center
+{
+ width: 1030px;
+ margin: 0 auto;
+ overflow: hidden;
}
-div#pts_container a
+div#pts_header_top_title
{
+ font-size: 42px;
+ font-weight: bold;
+ float: left;
+}
+div#pts_header_top_link_group
+{
+ padding: 14px 0 0;
+ float: right;
+}
+div#pts_header_top_link_group a
+{
+ margin: auto 6px;
+ text-decoration: none;
+ font-weight: bold;
+ font-size: 18px;
color: #FFF;
+ padding: 4px 8px;
+ border: solid #EEE 1px;
}
-div#pts_logo
+div#pts_header_top_link_group a:hover
{
+ color: #000;
+ background-color: #FFF;
+}
+div#pts_container
+{
+ text-align: left;
+ width: 920px;
+ margin: 0 auto;
+ overflow: hidden;
+ border: solid #EEE;
+ border-width: 0 1px;
+ min-height: 700px;
+}
+div.pts_box
+{
+ text-align: left;
+ border: solid #8B8F7C 1px;
+ margin: 10px 10px 20px;
+ padding: 1px 10px 15px;
+}
+div#pts_header_bottom a
+{
+ color: #FFF;
+}
+div#pts_header_bottom
+{
+ width: 100%;
margin: 0;
- width: 960px;
- height: 70px;
- background: #222 url(phoronix-test-suite.gif) no-repeat;
+ color: #FFF;
+ background-color: #222;
border: solid #000;
- border-width: 0 0 1px 0;
+ border-width: 1px 0 0;
}
-div#pts_benchmark_main_header
+div#pts_header_bottom_center
{
+ margin: 2px auto;
+ padding: 6px 0 10px;
+ width: 970px;
+ overflow: hidden;
+ font-size: 12px;
+ text-align: center;
+}
+div.pts_column_head
+{
+ font-size: 12px;
color: #FFF;
- font-size: 36px;
+ text-align: center;
+ margin: 0 3px;
+ background-color: #3B433A;
font-weight: bold;
- padding: 5px 0 5px 15px;
+ float: left;
+ border: solid #3B433A;
+ border-width: 1px;
+}
+div.pts_column_body
+{
+ font-size: 12px;
+ color: #000;
+ text-align: center;
+ margin: 0 3px;
+ background-color: #f5f5f5;
+ float: left;
+ border: solid #66695B;
+ border-width: 0 1px 1px;
}
-div#pts_description_area
+h1
{
- padding: 0 0 5px;
+ margin-top: 10px;
+ font-size: 21px;
+ color: #3B433A;
+ font-weight: bold;
}
-div#pts_benchmark_area
+div.pts_chart_box
{
- background-color: #FFF;
- padding: 15px 10px;
- color: #000;
+ width: 95%;
overflow: hidden;
+ margin: 5px auto;
}
-div.pts_benchmark_descriptor
+div.pts_chart_box a
{
- color: #EFEFEF;
- padding: 5px 20px;
+ text-decoration: none;
+ font-weight: bold;
}
-div.pts_area_box
+div.pts_chart_box a:hover
{
- background-color: #66695B;
- color: #EFEFEF;
- padding: 1px 5px 0;
- border: solid #000 1px;
+ text-decoration: underline;
+}
+div#pts_benchmark_area
+{
+ background-color: #FFF;
+ width: 90%;
+ margin: 5px auto;
+ color: #000;
+ overflow: hidden;
}
div.pts_benchmark_bar
{
- background-color: #2b6b29;
+ background-color: #40423A;
color: #FFF;
padding: 4px;
border: solid #000 1px;
diff --git a/pts-core/pts-results-viewer/viewer-old.xsl b/pts-core/pts-results-viewer/viewer-old.xsl
new file mode 100644
index 0000000..580f2b2
--- /dev/null
+++ b/pts-core/pts-results-viewer/viewer-old.xsl
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:template match="/">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>Phoronix Test Suite - Results Viewer</title>
+ <link href="pts-results-viewer/pts-viewer.css" rel="stylesheet" type="text/css" />
+ <script src="pts-results-viewer/pts.js" type="text/javascript"></script>
+ </head>
+ <body>
+ <div id="pts_container">
+ <div id="pts_description_area">
+ <div id="pts_logo"></div>
+ <div id="pts_benchmark_main_header"><xsl:value-of select="PhoronixTestSuite/Suite/Title"/></div>
+ <div class="pts_benchmark_descriptor" id="tsd_show" style="display: none;"><div class="pts_area_box"><p><xsl:value-of select="PhoronixTestSuite/Suite/Description"/></p><p style="font-size: 11px;"><em><xsl:value-of select="PhoronixTestSuite/Suite/Name" /> v<xsl:value-of select="PhoronixTestSuite/Suite/Version" /> is maintained by <xsl:value-of select="PhoronixTestSuite/Suite/Maintainer"/></em></p><p><span style="font-size: 11px;" onclick="switchShow('tsd_hidden');switchShow('tsd_show');"><< Hide Test Details</span></p></div></div>
+ <div class="pts_benchmark_descriptor" id="tsd_hidden"><span style="font-size: 11px;" onclick="switchShow('tsd_hidden');switchShow('tsd_show');hideObject('tips_show');showObject('tips_hidden');">Show Test Details >></span></div>
+ <div class="pts_benchmark_descriptor"><xsl:value-of select="PhoronixTestSuite/System/Hardware"/></div>
+ <div class="pts_benchmark_descriptor"><xsl:value-of select="PhoronixTestSuite/System/Software"/></div>
+ <div class="pts_benchmark_descriptor"><strong>Phoronix Test Suite v<xsl:value-of select="PhoronixTestSuite/System/Version"/></strong></div>
+ <div class="pts_benchmark_descriptor"><strong>Generated by <xsl:value-of select="PhoronixTestSuite/System/Author"/> on <xsl:value-of select="PhoronixTestSuite/System/TestDate"/></strong></div>
+ <div class="pts_benchmark_descriptor"><strong>Test Notes:</strong> <xsl:value-of select="PhoronixTestSuite/System/TestNotes"/></div>
+
+<div style="display: none">
+ <div class="pts_benchmark_descriptor" id="tips_hidden"><span style="font-size: 11px;" onclick="switchShow('tips_hidden');switchShow('tips_show');showObject('tsd_hidden');hideObject('tsd_show');">Performance Optimization Tips >></span></div>
+ <div class="pts_benchmark_descriptor" id="tips_show" style="display: none;"><div class="pts_area_box"><p><span style="font-size: 11px;" onclick="switchShow('tips_hidden');switchShow('tips_show');"><< Hide Tips</span></p>
+
+<p><span style="font-size: 11px;" onclick="switchShow('tips_hidden');switchShow('tips_show');"><< Hide Tips</span></p></div></div>
+</div>
+
+ </div>
+ <div id="pts_benchmark_area">
+ <xsl:for-each select="PhoronixTestSuite/Benchmark">
+ <div class="pts_benchmark_bar"><span class="pts_benchmark_bar_header"><xsl:value-of select="Name"/></span> <span class="pts_benchmark_bar_version">v<xsl:value-of select="Version"/></span><br /><strong><xsl:value-of select="Attributes"/></strong></div>
+ <div class="pts_benchmark_text">
+ <xsl:for-each select="Results/Group">
+ <div style="padding: 5px 0;">
+ <xsl:for-each select="Entry">
+ <strong><xsl:value-of select="Identifier"/>:</strong><span style="padding-left: 5px;"><xsl:value-of select="Value"/></span><br />
+ </xsl:for-each>
+ </div>
+ </xsl:for-each>
+ </div>
+ <div class="pts_benchmark_img_area"><img width="580" height="300"><xsl:attribute name="src">http://www.phoronix-test-suite.com/pts-grapher/r/graph-remote.php?t=<xsl:value-of select="Name" />&s=<xsl:value-of select="Attributes"/>&n=<xsl:value-of select="Version"/>&u=<xsl:value-of select="Scale"/>&p=<xsl:value-of select="Proportion"/>&i=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Identifier"/>;</xsl:for-each></xsl:for-each>&v=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Value"/>;</xsl:for-each></xsl:for-each>
+</xsl:attribute></img></div>
+ </xsl:for-each>
+ </div>
+ <p align="center">The <a href="http://www.phoronix-test-suite.com/">Phoronix Test Suite</a> is developed by <a href="http://www.phoronix.com/">Phoronix</a>, an Internet resource devoted to Linux hardware reviews, video driver articles, and much more.</p>
+ </div>
+ </body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/pts-core/pts-results-viewer/viewer.xsl b/pts-core/pts-results-viewer/viewer.xsl
index 580f2b2..3fb7c74 100644
--- a/pts-core/pts-results-viewer/viewer.xsl
+++ b/pts-core/pts-results-viewer/viewer.xsl
@@ -8,44 +8,67 @@
<script src="pts-results-viewer/pts.js" type="text/javascript"></script>
</head>
<body>
+ <div id="pts_header_top">
+ <div id="pts_header_top_center">
+ <div id="pts_header_top_title">Phoronix Test Suite</div>
+ <div id="pts_header_top_link_group"><a href="http://www.phoronix-test-suite.com/">Phoronix Test Suite</a><a href="http://global.phoronix-test-suite.com/index.php?k=results">PTS Global</a></div>
+ </div>
+ </div>
<div id="pts_container">
- <div id="pts_description_area">
- <div id="pts_logo"></div>
- <div id="pts_benchmark_main_header"><xsl:value-of select="PhoronixTestSuite/Suite/Title"/></div>
- <div class="pts_benchmark_descriptor" id="tsd_show" style="display: none;"><div class="pts_area_box"><p><xsl:value-of select="PhoronixTestSuite/Suite/Description"/></p><p style="font-size: 11px;"><em><xsl:value-of select="PhoronixTestSuite/Suite/Name" /> v<xsl:value-of select="PhoronixTestSuite/Suite/Version" /> is maintained by <xsl:value-of select="PhoronixTestSuite/Suite/Maintainer"/></em></p><p><span style="font-size: 11px;" onclick="switchShow('tsd_hidden');switchShow('tsd_show');"><< Hide Test Details</span></p></div></div>
- <div class="pts_benchmark_descriptor" id="tsd_hidden"><span style="font-size: 11px;" onclick="switchShow('tsd_hidden');switchShow('tsd_show');hideObject('tips_show');showObject('tips_hidden');">Show Test Details >></span></div>
- <div class="pts_benchmark_descriptor"><xsl:value-of select="PhoronixTestSuite/System/Hardware"/></div>
- <div class="pts_benchmark_descriptor"><xsl:value-of select="PhoronixTestSuite/System/Software"/></div>
- <div class="pts_benchmark_descriptor"><strong>Phoronix Test Suite v<xsl:value-of select="PhoronixTestSuite/System/Version"/></strong></div>
- <div class="pts_benchmark_descriptor"><strong>Generated by <xsl:value-of select="PhoronixTestSuite/System/Author"/> on <xsl:value-of select="PhoronixTestSuite/System/TestDate"/></strong></div>
- <div class="pts_benchmark_descriptor"><strong>Test Notes:</strong> <xsl:value-of select="PhoronixTestSuite/System/TestNotes"/></div>
-
-<div style="display: none">
- <div class="pts_benchmark_descriptor" id="tips_hidden"><span style="font-size: 11px;" onclick="switchShow('tips_hidden');switchShow('tips_show');showObject('tsd_hidden');hideObject('tsd_show');">Performance Optimization Tips >></span></div>
- <div class="pts_benchmark_descriptor" id="tips_show" style="display: none;"><div class="pts_area_box"><p><span style="font-size: 11px;" onclick="switchShow('tips_hidden');switchShow('tips_show');"><< Hide Tips</span></p>
-
-<p><span style="font-size: 11px;" onclick="switchShow('tips_hidden');switchShow('tips_show');"><< Hide Tips</span></p></div></div>
-</div>
+
+ <div class="pts_box">
+
+ <h1><xsl:value-of select="PhoronixTestSuite/Suite/Title" /></h1>
+ <p><xsl:value-of select="PhoronixTestSuite/Suite/Name" /> v<xsl:value-of select="PhoronixTestSuite/Suite/Version" /> (<xsl:value-of select="PhoronixTestSuite/Suite/Type" /> Benchmarks)</p>
+ <p id="tsd_show" style="display: none;"><div class="pts_area_box"><p><xsl:value-of select="PhoronixTestSuite/Suite/Description"/></p><p style="font-size: 11px;"><em>This test is maintained by <xsl:value-of select="PhoronixTestSuite/Suite/Maintainer" />.</em></p><p><a onclick="switchShow('tsd_hidden');switchShow('tsd_show');"><< Hide Test Details</a></p></div></p>
+ <p class="pts_benchmark_descriptor" id="tsd_hidden"><a onclick="switchShow('tsd_hidden');switchShow('tsd_show');hideObject('tips_show');showObject('tips_hidden');">Show Test Details >></a></p>
+ <xsl:variable name="idcount"><xsl:value-of select="count(PhoronixTestSuite/System)" /></xsl:variable>
+ <xsl:variable name="idwidth"><xsl:value-of select="floor(820 div $idcount) - 1" /></xsl:variable>
+ <h1>System Hardware</h1>
+ <div class="pts_chart_box">
+ <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_head"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="AssociatedIdentifiers" /></div></xsl:for-each>
+ <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_body"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="Hardware" /></div></xsl:for-each>
+ </div>
+ <h1>System Software</h1>
+ <div class="pts_chart_box">
+ <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_head"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="AssociatedIdentifiers" /></div></xsl:for-each>
+ <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_body"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="Software" /></div></xsl:for-each>
+ </div>
+ <h1>Additional Details</h1>
+ <div class="pts_chart_box">
+ <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_head"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="AssociatedIdentifiers" /></div></xsl:for-each>
+ <xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_body"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><strong>Author:</strong> <xsl:value-of select="AssociatedIdentifiers" /><br /><strong>Test Date/Time:</strong> <xsl:value-of select="TestDate" /><br /><strong>PTS Version:</strong> <xsl:value-of select="Version" /></div></xsl:for-each>
+ </div>
</div>
- <div id="pts_benchmark_area">
- <xsl:for-each select="PhoronixTestSuite/Benchmark">
- <div class="pts_benchmark_bar"><span class="pts_benchmark_bar_header"><xsl:value-of select="Name"/></span> <span class="pts_benchmark_bar_version">v<xsl:value-of select="Version"/></span><br /><strong><xsl:value-of select="Attributes"/></strong></div>
- <div class="pts_benchmark_text">
- <xsl:for-each select="Results/Group">
- <div style="padding: 5px 0;">
- <xsl:for-each select="Entry">
- <strong><xsl:value-of select="Identifier"/>:</strong><span style="padding-left: 5px;"><xsl:value-of select="Value"/></span><br />
- </xsl:for-each>
- </div>
- </xsl:for-each>
- </div>
- <div class="pts_benchmark_img_area"><img width="580" height="300"><xsl:attribute name="src">http://www.phoronix-test-suite.com/pts-grapher/r/graph-remote.php?t=<xsl:value-of select="Name" />&s=<xsl:value-of select="Attributes"/>&n=<xsl:value-of select="Version"/>&u=<xsl:value-of select="Scale"/>&p=<xsl:value-of select="Proportion"/>&i=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Identifier"/>;</xsl:for-each></xsl:for-each>&v=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Value"/>;</xsl:for-each></xsl:for-each>
-</xsl:attribute></img></div>
- </xsl:for-each>
+
+ <div class="pts_box">
+ <h1>Test Results</h1>
+
+ <div id="pts_benchmark_area">
+ <xsl:for-each select="PhoronixTestSuite/Benchmark">
+ <div class="pts_benchmark_bar"><span class="pts_benchmark_bar_header"><xsl:value-of select="Name"/></span> <span class="pts_benchmark_bar_version">v<xsl:value-of select="Version"/></span><br /><strong><xsl:value-of select="Attributes"/></strong></div>
+ <div class="pts_benchmark_text">
+ <xsl:for-each select="Results/Group">
+ <div style="padding: 5px 0;">
+ <xsl:for-each select="Entry">
+ <strong><xsl:value-of select="Identifier"/>:</strong><span style="padding-left: 5px;"><xsl:value-of select="Value"/></span><br />
+ </xsl:for-each>
+ </div>
+ </xsl:for-each>
+ </div>
+ <div class="pts_benchmark_img_area"><img width="580" height="300"><xsl:attribute name="src">http://www.phoronix-test-suite.com/pts-grapher/r/graph-remote.php?t=<xsl:value-of select="Name" />&s=<xsl:value-of select="Attributes"/>&n=<xsl:value-of select="Version"/>&u=<xsl:value-of select="Scale"/>&p=<xsl:value-of select="Proportion"/>&i=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Identifier"/>;</xsl:for-each></xsl:for-each>&v=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Value"/>;</xsl:for-each></xsl:for-each>
+ </xsl:attribute></img></div>
+ </xsl:for-each>
+ </div>
+
+
</div>
- <p align="center">The <a href="http://www.phoronix-test-suite.com/">Phoronix Test Suite</a> is developed by <a href="http://www.phoronix.com/">Phoronix</a>, an Internet resource devoted to Linux hardware reviews, video driver articles, and much more.</p>
</div>
+ <div id="pts_header_bottom">
+ <div id="pts_header_bottom_center">The <a href="http://www.phoronix-test-suite.com/">Phoronix Test Suite</a> is developed by <a href="http://www.phoronix.com/">Phoronix</a>, an Internet resource devoted to Linux hardware reviews, video driver articles, and much more.</div>
+ </div>
+
</body>
</html>
</xsl:template>
diff --git a/pts/benchmark-profiles/compress-gzip.xml b/pts/benchmark-profiles/compress-gzip.xml
index ae56e28..80aa6e1 100644
--- a/pts/benchmark-profiles/compress-gzip.xml
+++ b/pts/benchmark-profiles/compress-gzip.xml
@@ -1,6 +1,6 @@
<PTSBenchmark>
<PhoronixTestSuite>
- <Version>0.2</Version>
+ <Version>0.3</Version>
<BenchmarkType>Processor</BenchmarkType>
<ApplicationType>Utility</ApplicationType>
<License>FREE</License>
diff --git a/pts/benchmark-profiles/encode-flac.xml b/pts/benchmark-profiles/encode-flac.xml
index 1b8056b..65a1d1d 100644
--- a/pts/benchmark-profiles/encode-flac.xml
+++ b/pts/benchmark-profiles/encode-flac.xml
@@ -1,6 +1,6 @@
<PTSBenchmark>
<PhoronixTestSuite>
- <Version>0.1</Version>
+ <Version>0.2</Version>
<BenchmarkType>Processor</BenchmarkType>
<ApplicationType>Utility</ApplicationType>
<License>FREE</License>
diff --git a/pts/benchmark-profiles/encode-mp3.xml b/pts/benchmark-profiles/encode-mp3.xml
index 6545bdc..10c65f5 100644
--- a/pts/benchmark-profiles/encode-mp3.xml
+++ b/pts/benchmark-profiles/encode-mp3.xml
@@ -1,6 +1,6 @@
<PTSBenchmark>
<PhoronixTestSuite>
- <Version>0.1</Version>
+ <Version>0.2</Version>
<BenchmarkType>Processor</BenchmarkType>
<ApplicationType>Utility</ApplicationType>
<License>FREE</License>
diff --git a/pts/benchmark-profiles/encode-ogg.xml b/pts/benchmark-profiles/encode-ogg.xml
index dac38aa..086bc35 100644
--- a/pts/benchmark-profiles/encode-ogg.xml
+++ b/pts/benchmark-profiles/encode-ogg.xml
@@ -1,6 +1,6 @@
<PTSBenchmark>
<PhoronixTestSuite>
- <Version>0.1</Version>
+ <Version>0.2</Version>
<BenchmarkType>Processor</BenchmarkType>
<ApplicationType>Utility</ApplicationType>
<License>FREE</License>
diff --git a/pts/benchmark-resources/compress-gzip/install.sh b/pts/benchmark-resources/compress-gzip/install.sh
index 1c7ff72..aa18ac5 100644
--- a/pts/benchmark-resources/compress-gzip/install.sh
+++ b/pts/benchmark-resources/compress-gzip/install.sh
@@ -2,23 +2,16 @@
cd $1
-if [ ! -f ../pts-shared/pts-wav-sample-file.tar.bz2 ]
+if [ ! -f ../pts-shared/pts-wav-sample-file.wav ]
then
wget http://www.phoronix-test-suite.com/benchmark-files/pts-wav-sample-file.tar.bz2 -O ../pts-shared/pts-wav-sample-file.tar.bz2
+ tar -jxvf ../pts-shared/pts-wav-sample-file.tar.bz2 -C ../pts-shared/
+ rm -f ../pts-shared/pts-wav-sample-file.tar.bz2
fi
-rm -f bigfile
-tar -jxvf ../pts-shared/pts-wav-sample-file.tar.bz2
-
-rm -f bigfile-orig
-for i in 1 2 3 4 5 6 7 8
-do
-cat pts-wav-sample-file.wav >> bigfile-orig
-done
-
cat > gzip_bigfile <<EOT
#!/bin/sh
-gzip -c bigfile-orig >/dev/null
+for i in 1 2 3 4 5 6 7 8; do cat ../pts-shared/pts-wav-sample-file.wav; done|gzip -c >/dev/null
EOT
chmod +x gzip_bigfile
diff --git a/pts/benchmark-resources/compress-gzip/post.sh b/pts/benchmark-resources/compress-gzip/post.sh
deleted file mode 100644
index 433ad37..0000000
--- a/pts/benchmark-resources/compress-gzip/post.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd $1
-rm -f bigfile.gz
diff --git a/pts/benchmark-resources/compress-gzip/pre.sh b/pts/benchmark-resources/compress-gzip/pre.sh
index 433ad37..f53506f 100644
--- a/pts/benchmark-resources/compress-gzip/pre.sh
+++ b/pts/benchmark-resources/compress-gzip/pre.sh
@@ -1,4 +1,4 @@
#!/bin/sh
cd $1
-rm -f bigfile.gz
+cat ../pts-shared/pts-wav-sample-file.wav > /dev/null
diff --git a/pts/benchmark-resources/encode-flac/install.sh b/pts/benchmark-resources/encode-flac/install.sh
index 4eae3bf..64c2a6d 100644
--- a/pts/benchmark-resources/encode-flac/install.sh
+++ b/pts/benchmark-resources/encode-flac/install.sh
@@ -7,9 +7,11 @@ if [ ! -f flac.tar.gz ]
wget http://internap.dl.sourceforge.net/sourceforge/flac/flac-1.2.1.tar.gz -O flac.tar.gz
fi
-if [ ! -f ../pts-shared/pts-wav-sample-file.tar.bz2 ]
+if [ ! -f ../pts-shared/pts-wav-sample-file.wav ]
then
wget http://www.phoronix-test-suite.com/benchmark-files/pts-wav-sample-file.tar.bz2 -O ../pts-shared/pts-wav-sample-file.tar.bz2
+ tar -jxvf ../pts-shared/pts-wav-sample-file.tar.bz2 -C ../pts-shared/
+ rm -f ../pts-shared/pts-wav-sample-file.tar.bz2
fi
tar -xvf flac.tar.gz
@@ -19,9 +21,6 @@ make -j $NUM_CPU_JOBS
cd ..
echo "#!/bin/sh
-/usr/bin/time -f \"WAV To FLAC Encode Time: %e Seconds\" ./flac-1.2.1/src/flac/flac -s --best audio.wav 2>&1
-rm -f audio.flac" > flac
+/usr/bin/time -f \"WAV To FLAC Encode Time: %e Seconds\" ./flac-1.2.1/src/flac/flac -s --best ../pts-shared/pts-wav-sample-file.wav 2>&1
+rm -f ../pts-shared/pts-wav-sample-file.flac" > flac
chmod +x flac
-
-tar -jxvf ../pts-shared/pts-wav-sample-file.tar.bz2
-
diff --git a/pts/benchmark-resources/encode-flac/post.sh b/pts/benchmark-resources/encode-flac/post.sh
index dd74f62..4c8b78c 100644
--- a/pts/benchmark-resources/encode-flac/post.sh
+++ b/pts/benchmark-resources/encode-flac/post.sh
@@ -1,5 +1,4 @@
#!/bin/sh
cd $1
-rm -f audio.wav
-rm -f audio.flac
+rm -f pts-wav-sample-file.flac
diff --git a/pts/benchmark-resources/encode-flac/pre.sh b/pts/benchmark-resources/encode-flac/pre.sh
index 8a9984a..4c8b78c 100644
--- a/pts/benchmark-resources/encode-flac/pre.sh
+++ b/pts/benchmark-resources/encode-flac/pre.sh
@@ -1,6 +1,4 @@
#!/bin/sh
cd $1
-rm -f audio.wav
-rm -f audio.flac
-cp pts-wav-sample-file.wav audio.wav
+rm -f pts-wav-sample-file.flac
diff --git a/pts/benchmark-resources/encode-mp3/install.sh b/pts/benchmark-resources/encode-mp3/install.sh
index 302bdfc..bd073e2 100644
--- a/pts/benchmark-resources/encode-mp3/install.sh
+++ b/pts/benchmark-resources/encode-mp3/install.sh
@@ -7,9 +7,11 @@ if [ ! -f lame.tar.gz ]
wget http://superb-east.dl.sourceforge.net/sourceforge/lame/lame-3.97.tar.gz -O lame.tar.gz
fi
-if [ ! -f ../pts-shared/pts-wav-sample-file.tar.bz2 ]
+if [ ! -f ../pts-shared/pts-wav-sample-file.wav ]
then
wget http://www.phoronix-test-suite.com/benchmark-files/pts-wav-sample-file.tar.bz2 -O ../pts-shared/pts-wav-sample-file.tar.bz2
+ tar -jxvf ../pts-shared/pts-wav-sample-file.tar.bz2 -C ../pts-shared/
+ rm -f ../pts-shared/pts-wav-sample-file.tar.bz2
fi
tar -xvf lame.tar.gz
@@ -19,8 +21,7 @@ make -j $NUM_CPU_JOBS
cd ..
echo "#!/bin/sh
-/usr/bin/time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame-3.97/frontend/lame --silent -h audio.wav audio.mp3 2>&1" > lame
+rm -f audio.mp3
+/usr/bin/time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame-3.97/frontend/lame --silent -h ../pts-shared/pts-wav-sample-file.wav audio.mp3 2>&1" > lame
chmod +x lame
-tar -jxvf ../pts-shared/pts-wav-sample-file.tar.bz2
-
diff --git a/pts/benchmark-resources/encode-mp3/post.sh b/pts/benchmark-resources/encode-mp3/post.sh
index 328f787..77ab096 100644
--- a/pts/benchmark-resources/encode-mp3/post.sh
+++ b/pts/benchmark-resources/encode-mp3/post.sh
@@ -1,5 +1,4 @@
#!/bin/sh
cd $1
-rm -f audio.wav
rm -f audio.mp3
diff --git a/pts/benchmark-resources/encode-mp3/pre.sh b/pts/benchmark-resources/encode-mp3/pre.sh
index 6697d3a..77ab096 100644
--- a/pts/benchmark-resources/encode-mp3/pre.sh
+++ b/pts/benchmark-resources/encode-mp3/pre.sh
@@ -1,6 +1,4 @@
#!/bin/sh
cd $1
-rm -f audio.wav
rm -f audio.mp3
-cp pts-wav-sample-file.wav audio.wav
diff --git a/pts/benchmark-resources/encode-ogg/install.sh b/pts/benchmark-resources/encode-ogg/install.sh
index c273c10..8906c9c 100644
--- a/pts/benchmark-resources/encode-ogg/install.sh
+++ b/pts/benchmark-resources/encode-ogg/install.sh
@@ -17,9 +17,11 @@ if [ ! -f vorbis-tools.tar.gz ]
wget http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.2.0.tar.gz -O vorbis-tools.tar.gz
fi
-if [ ! -f ../pts-shared/pts-wav-sample-file.tar.bz2 ]
+if [ ! -f ../pts-shared/pts-wav-sample-file.wav ]
then
wget http://www.phoronix-test-suite.com/benchmark-files/pts-wav-sample-file.tar.bz2 -O ../pts-shared/pts-wav-sample-file.tar.bz2
+ tar -jxvf ../pts-shared/pts-wav-sample-file.tar.bz2 -C ../pts-shared/
+ rm -f ../pts-shared/pts-wav-sample-file.tar.bz2
fi
THIS_DIR=$(pwd)
@@ -48,7 +50,5 @@ make install
cd ..
echo "#!/bin/sh
-/usr/bin/time -f \"WAV To OGG Encode Time: %e Seconds\" ./vorbis/bin/oggenc --quiet audio.wav -q 10 -o audio.ogg 2>&1" > oggenc
+/usr/bin/time -f \"WAV To OGG Encode Time: %e Seconds\" ./vorbis/bin/oggenc --quiet ../pts-shared/pts-wav-sample-file.wav -q 10 -o audio.ogg 2>&1" > oggenc
chmod +x oggenc
-
-tar -jxvf ../pts-shared/pts-wav-sample-file.tar.bz2
diff --git a/pts/benchmark-resources/encode-ogg/post.sh b/pts/benchmark-resources/encode-ogg/post.sh
index d6ce716..acccc70 100644
--- a/pts/benchmark-resources/encode-ogg/post.sh
+++ b/pts/benchmark-resources/encode-ogg/post.sh
@@ -1,5 +1,4 @@
#!/bin/sh
cd $1
-rm -f audio.wav
rm -f audio.ogg
diff --git a/pts/benchmark-resources/encode-ogg/pre.sh b/pts/benchmark-resources/encode-ogg/pre.sh
index 5ae5f05..e070224 100644
--- a/pts/benchmark-resources/encode-ogg/pre.sh
+++ b/pts/benchmark-resources/encode-ogg/pre.sh
@@ -1,6 +1,5 @@
#!/bin/sh
cd $1
-rm -f audio.wav
rm -f audio.ogg
-cp pts-wav-sample-f