diff options
Diffstat (limited to 'pts')
| -rw-r--r-- | pts/test-profiles/base/java-environment.xml | 5 | ||||
| -rw-r--r-- | pts/test-profiles/j2dbench.xml | 2 | ||||
| -rw-r--r-- | pts/test-profiles/java-scimark2.xml | 2 | ||||
| -rw-r--r-- | pts/test-profiles/jgfxbat.xml | 2 | ||||
| -rw-r--r-- | pts/test-profiles/sunflow.xml | 2 | ||||
| -rw-r--r-- | pts/test-resources/base/java-environment/post.php | 21 | ||||
| -rwxr-xr-x | pts/test-resources/java-scimark2/install.sh | 14 |
7 files changed, 37 insertions, 11 deletions
diff --git a/pts/test-profiles/base/java-environment.xml b/pts/test-profiles/base/java-environment.xml new file mode 100644 index 0000000..2b789c1 --- /dev/null +++ b/pts/test-profiles/base/java-environment.xml @@ -0,0 +1,5 @@ +<PhoronixTestSuite> + <TestInformation> + <ExternalDependencies>java</ExternalDependencies> + </TestInformation> +</PhoronixTestSuite> diff --git a/pts/test-profiles/j2dbench.xml b/pts/test-profiles/j2dbench.xml index c62dbe9..f575eec 100644 --- a/pts/test-profiles/j2dbench.xml +++ b/pts/test-profiles/j2dbench.xml @@ -7,11 +7,11 @@ <Status>VERIFIED</Status> <Maintainer>Tao Zhang</Maintainer> <ProjectURL>http://www.java.net/</ProjectURL> + <Extends>java-environment</Extends> </TestProfile> <TestInformation> <Title>Java 2D Microbenchmark</Title> <Version>1.0</Version> - <ExternalDependencies>java</ExternalDependencies> <TimesToRun>3</TimesToRun> <ResultScale>Units Per Second</ResultScale> <Proportion>HIB</Proportion> diff --git a/pts/test-profiles/java-scimark2.xml b/pts/test-profiles/java-scimark2.xml index 3ddc632..478d500 100644 --- a/pts/test-profiles/java-scimark2.xml +++ b/pts/test-profiles/java-scimark2.xml @@ -8,11 +8,11 @@ <Maintainer>Michael Larabel</Maintainer> <EnvironmentSize>0.05</EnvironmentSize> <ProjectURL>http://math.nist.gov/scimark2/</ProjectURL> + <Extends>java-environment</Extends> </TestProfile> <TestInformation> <Title>Java SciMark</Title> <Version>2.0</Version> - <ExternalDependencies>java</ExternalDependencies> <TimesToRun>4</TimesToRun> <ResultScale>Mflops</ResultScale> <Proportion>HIB</Proportion> diff --git a/pts/test-profiles/jgfxbat.xml b/pts/test-profiles/jgfxbat.xml index 51b7b73..6495a4e 100644 --- a/pts/test-profiles/jgfxbat.xml +++ b/pts/test-profiles/jgfxbat.xml @@ -7,12 +7,12 @@ <Status>VERIFIED</Status> <EnvironmentSize>0.4</EnvironmentSize> <Maintainer>Tao Zhang</Maintainer> + <Extends>java-environment</Extends> <ProjectURL>http://www.java.net/</ProjectURL> </TestProfile> <TestInformation> <Title>Java Graphics Basic Acceptance Test</Title> <Version>2.0</Version> - <ExternalDependencies>java</ExternalDependencies> <TimesToRun>1</TimesToRun> <ResultFormat>PASS_FAIL</ResultFormat> <Description>This test runs a series of automated performance/quality sub-tests that exercise the OpenGL-based Java 2D pipeline in order to verify the quality of OpenGL drivers.</Description> diff --git a/pts/test-profiles/sunflow.xml b/pts/test-profiles/sunflow.xml index 8586b91..4c72a43 100644 --- a/pts/test-profiles/sunflow.xml +++ b/pts/test-profiles/sunflow.xml @@ -8,13 +8,13 @@ <Maintainer>Michael Larabel</Maintainer> <EnvironmentSize>1.3</EnvironmentSize> <ProjectURL>http://sunflow.sourceforge.net/</ProjectURL> + <Extends>java-environment</Extends> </TestProfile> <TestInformation> <Title>Sunflow Rendering System</Title> <Version>0.07.2</Version> <SubTitle>Global Illumination + Image Synthesis</SubTitle> <Executable>sunflow-benchmark</Executable> - <ExternalDependencies>java</ExternalDependencies> <TimesToRun>2</TimesToRun> <ResultScale>Seconds</ResultScale> <Proportion>LIB</Proportion> diff --git a/pts/test-resources/base/java-environment/post.php b/pts/test-resources/base/java-environment/post.php new file mode 100644 index 0000000..1130c39 --- /dev/null +++ b/pts/test-resources/base/java-environment/post.php @@ -0,0 +1,21 @@ +<?php + +$java_version = trim(shell_exec("java -version 2>&1")); + +if(stripos($java_version, "Java") !== FALSE) +{ + $java_version = explode("\n", $java_version); + + if(($cut = count($java_version) - 2) > 0) + { + $v = trim($java_version[$cut]); + } + else + { + $v = trim(array_pop($java_version)); + } + file_put_contents("pts-test-note", $v); +} + +?> + diff --git a/pts/test-resources/java-scimark2/install.sh b/pts/test-resources/java-scimark2/install.sh index 2ffa215..dd2d993 100755 --- a/pts/test-resources/java-scimark2/install.sh +++ b/pts/test-resources/java-scimark2/install.sh @@ -5,26 +5,26 @@ unzip -o scimark2lib.zip echo "#!/bin/sh rm -f *.result -java jnt.scimark2.commandline > \$LOG_FILE +java jnt.scimark2.commandline > \$LOG_FILE.result case \"\$1\" in \"TEST_COMPOSITE\") - cat \$LOG_FILE | grep \"Composite Score\" + cat \$LOG_FILE.result | grep \"Composite Score\" ;; \"TEST_FFT\") - cat \$LOG_FILE | grep \"FFT (1024)\" + cat \$LOG_FILE.result | grep \"FFT (1024)\" ;; \"TEST_SOR\") - cat \$LOG_FILE | grep \"SOR (100x100)\" + cat \$LOG_FILE.result | grep \"SOR (100x100)\" ;; \"TEST_MONTE\") - cat \$LOG_FILE | grep \"Monte Carlo\" + cat \$LOG_FILE.result | grep \"Monte Carlo\" ;; \"TEST_SPARSE\") - cat \$LOG_FILE | grep \"Sparse matmult\" + cat \$LOG_FILE.result | grep \"Sparse matmult\" ;; \"TEST_DENSE\") - cat \$LOG_FILE | grep \"LU (100x100)\" + cat \$LOG_FILE.result | grep \"LU (100x100)\" ;; esac" > java-scimark2 chmod +x java-scimark2 |