summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-11-30 12:52:16 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-11-30 12:52:16 -0500
commitfa9755453df651d1e9e1a2853de35bfec96847f8 (patch)
tree56c03ee5dcff0bebd8342d593332930e0bea75ac
parentadbeecf3847a5aebd00640cb20aecc575011b3de (diff)
downloadphoronix-test-suite-upstream-fa9755453df651d1e9e1a2853de35bfec96847f8.tar.gz
phoronix-test-suite-upstream-fa9755453df651d1e9e1a2853de35bfec96847f8.tar.xz
phoronix-test-suite-upstream-fa9755453df651d1e9e1a2853de35bfec96847f8.zip
pts: Update sqlite test profile to version 3.6.6.2
-rw-r--r--TYDAL-CHANGE-LOG1
-rw-r--r--pts/test-profiles/sqlite.xml5
-rw-r--r--pts/test-resources/sqlite/downloads.xml6
-rwxr-xr-xpts/test-resources/sqlite/install.sh22
4 files changed, 19 insertions, 15 deletions
diff --git a/TYDAL-CHANGE-LOG b/TYDAL-CHANGE-LOG
index 4883938..0e8b51a 100644
--- a/TYDAL-CHANGE-LOG
+++ b/TYDAL-CHANGE-LOG
@@ -24,6 +24,7 @@ Phoronix Test Suite (Git)
- pts-core: Remove DownloadSize tag that was deprecated from the test profiles since PTS 1.4 since it's been replaced in the downloads.xml specification
- pts-core: Update CSS and XSL for results viewer, fix table column alignment bug
- pts: Add adjustable file size support for bonnie test profile
+- pts: Update sqlite test profile to version 3.6.6.2
- tandem_XmlReader: Major performance improvements and optimizations
- bilde_renderer: New PTS-spawned abstracted image rendering interface that supports SVG and PNG rendering with a standard API
- pts_Graph: Various changes to the graphing object
diff --git a/pts/test-profiles/sqlite.xml b/pts/test-profiles/sqlite.xml
index e545b60..1c97c37 100644
--- a/pts/test-profiles/sqlite.xml
+++ b/pts/test-profiles/sqlite.xml
@@ -1,6 +1,6 @@
<PhoronixTestSuite>
<TestProfile>
- <Version>1.2.0</Version>
+ <Version>1.3.0</Version>
<TestType>System</TestType>
<SoftwareType>Benchmark</SoftwareType>
<License>FREE</License>
@@ -12,8 +12,9 @@
</TestProfile>
<TestInformation>
<Title>SQLite</Title>
- <Version>3.6.3</Version>
+ <Version>3.6.6.2</Version>
<TimesToRun>3</TimesToRun>
+ <Executable>sqlite-benchmark</Executable>
<SubTitle>12,500 INSERTs</SubTitle>
<ResultScale>Seconds</ResultScale>
<Proportion>LIB</Proportion>
diff --git a/pts/test-resources/sqlite/downloads.xml b/pts/test-resources/sqlite/downloads.xml
index c550abe..797c416 100644
--- a/pts/test-resources/sqlite/downloads.xml
+++ b/pts/test-resources/sqlite/downloads.xml
@@ -1,9 +1,9 @@
<PhoronixTestSuite>
<Downloads>
<Package>
- <URL>http://www.sqlite.org/sqlite-3.6.3.tar.gz</URL>
- <MD5>671d2715f33158abc47a7a2ddd6066c5</MD5>
- <FileSize>2332857</FileSize>
+ <URL>http://www.sqlite.org/sqlite-3.6.6.2.tar.gz</URL>
+ <MD5>23cd36188f21d427d45191d317bcbcd5</MD5>
+ <FileSize>2303256</FileSize>
</Package>
<Package>
<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-sqlite-tests-1.tar.gz, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-sqlite-tests-1.tar.gz</URL>
diff --git a/pts/test-resources/sqlite/install.sh b/pts/test-resources/sqlite/install.sh
index 4cc1296..a720db7 100755
--- a/pts/test-resources/sqlite/install.sh
+++ b/pts/test-resources/sqlite/install.sh
@@ -1,26 +1,28 @@
#!/bin/sh
tar -xvf pts-sqlite-tests-1.tar.gz
-tar -xvf sqlite-3.6.3.tar.gz
-cd sqlite-3.6.3/
+tar -xvf sqlite-3.6.6.2.tar.gz
+mv sqlite-3.6.6.2/ sqlite_env/
+
+cd sqlite_env/
./configure
make -j $NUM_CPU_JOBS
cd ..
echo "#!/bin/sh
-cat sqlite-2500-insertions.txt | ./sqlite-3.6.3/sqlite3 benchmark.db
-cat sqlite-2500-insertions.txt | ./sqlite-3.6.3/sqlite3 benchmark.db
-cat sqlite-2500-insertions.txt | ./sqlite-3.6.3/sqlite3 benchmark.db
-cat sqlite-2500-insertions.txt | ./sqlite-3.6.3/sqlite3 benchmark.db
-cat sqlite-2500-insertions.txt | ./sqlite-3.6.3/sqlite3 benchmark.db" > sqlite-inserts
+cat sqlite-2500-insertions.txt | ./sqlite_env/sqlite3 benchmark.db
+cat sqlite-2500-insertions.txt | ./sqlite_env/sqlite3 benchmark.db
+cat sqlite-2500-insertions.txt | ./sqlite_env/sqlite3 benchmark.db
+cat sqlite-2500-insertions.txt | ./sqlite_env/sqlite3 benchmark.db
+cat sqlite-2500-insertions.txt | ./sqlite_env/sqlite3 benchmark.db" > sqlite-inserts
chmod +x sqlite-inserts
echo "#!/bin/sh
rm -f benchmark.db
-./sqlite-3.6.3/sqlite3 benchmark.db \"CREATE TABLE pts1 ('I' SMALLINT NOT NULL, 'DT' TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, 'F1' VARCHAR(4) NOT NULL, 'F2' VARCHAR(16) NOT NULL);\"
+./sqlite_env/sqlite3 benchmark.db \"CREATE TABLE pts1 ('I' SMALLINT NOT NULL, 'DT' TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, 'F1' VARCHAR(4) NOT NULL, 'F2' VARCHAR(16) NOT NULL);\"
\$TIMER_START
./sqlite-inserts 2>&1
\$TIMER_STOP
-rm -f benchmark.db" > sqlite
-chmod +x sqlite
+rm -f benchmark.db" > sqlite-benchmark
+chmod +x sqlite-benchmark