Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Wed 2/3/10 13:04
Recent Commits
>
--git a/pts-core/functions/pts-functions.php b/pts-core/functions/pts-functions.php
index 1e12dea..5cd20b0 100644
--- a/pts-core/functions/pts-functions.php
+++ b/pts-core/functions/pts-functions.php
@@ -368,7 +368,7 @@ function pts_bool_question($question, $default = true)
if($input == "y")
$answer = true;
- else if($intput == "n")
+ else if($input == "n")
$answer = false;
else
$answer = $default;
diff --git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php
index d6c6874..3fd8097 100644
--- a/pts-core/functions/pts-functions_config.php
+++ b/pts-core/functions/pts-functions_config.php
@@ -16,10 +16,14 @@ function pts_user_config_init()
$config = new tandem_XmlWriter();
$config->addXmlObject("PhoronixTestSuite/GlobalDatabase/UserName", 0, pts_read_user_config("PhoronixTestSuite/GlobalDatabase/UserName", "Default User", $read_config));
$config->addXmlObject("PhoronixTestSuite/GlobalDatabase/UploadKey", 0, pts_read_user_config("PhoronixTestSuite/GlobalDatabase/UploadKey", "", $read_config));
+
$config->addXmlObject("PhoronixTestSuite/Options/Results/Directory", 1, pts_read_user_config("PhoronixTestSuite/Options/Results/Directory", "~/pts-test-results/", $read_config));
+
$config->addXmlObject("PhoronixTestSuite/Options/Benchmarking/EnvironmentDirectory", 2, pts_read_user_config("PhoronixTestSuite/Options/Benchmarking/EnvironmentDirectory", "~/pts-benchmark-env/", $read_config));
$config->addXmlObject("PhoronixTestSuite/Options/Benchmarking/SleepTimeBetweenTests", 2, pts_read_user_config("PhoronixTestSuite/Options/Benchmarking/SleepTimeBetweenTests", "5", $read_config));
+ $config->addXmlObject("PhoronixTestSuite/Options/Benchmarking/SleepTimeBetweenTests", 2, pts_read_user_config("PhoronixTestSuite/Options/Benchmarking/SleepTimeBetweenTests", "5", $read_config));
+
file_put_contents(PTS_USER_DIR . "user-config.xml", $config->getXML());
}
diff --git a/pts/benchmark-profiles/doom3.xml b/pts/benchmark-profiles/doom3.xml
index 782a7bb..9132620 100644
--- a/pts/benchmark-profiles/doom3.xml
+++ b/pts/benchmark-profiles/doom3.xml
@@ -1,6 +1,6 @@
<PTSBenchmark>
<PhoronixTestSuite>
- <Version>0.1</Version>
+ <Version>0.2</Version>
<BenchmarkType>Graphics</BenchmarkType>
<ApplicationType>Game</ApplicationType>
<License>NON-FREE</License>
@@ -19,89 +19,47 @@
</Information>
<Settings>
<Default>
- <Arguments>+timedemoquit demo1 +set r_mode -1</Arguments>
+ <Arguments>+exec doom3-pts.cfg +set sys_VideoRam $VIDEO_MEMORY +set r_mode -1 +timedemoquit demo1</Arguments>
<PossiblePaths></PossiblePaths>
</Default>
<Option>
- <DisplayName>Video RAM</DisplayName>
- <Identifier>video-ram</Identifier>
- <ArgumentName>+set sys_VideoRam </ArgumentName>
+ <DisplayName>Resolution</DisplayName>
+ <Identifier>resolution</Identifier>
+ <ArgumentName></ArgumentName>
<Menu>
<Entry>
- <Name>128MB</Name>
- <Value>128</Value>
+ <Name>800 x 600</Name>
+ <Value>+set r_customWidth 800 +set r_customHeight 600</Value>
</Entry>
<Entry>
- <Name>256MB</Name>
- <Value>256</Value>
+ <Name>1024 x 768</Name>
+ <Value>+set r_customWidth 1024 +set r_customHeight 768</Value>
</Entry>
<Entry>
- <Name>512MB</Name>
- <Value>512</Value>
+ <Name>1280 x 1024</Name>
+ <Value>+set r_customWidth 1280 +set r_customHeight 1024</Value>
</Entry>
<Entry>
- <Name>640MB</Name>
- <Value>640</Value>
- </Entry>
- <Entry>
- <Name>1GB</Name>
- <Value>1024</Value>
- </Entry>
- </Menu>
- </Option>
- <Option>
- <DisplayName>Resolution (Width)</DisplayName>
- <Identifier>width-resolution</Identifier>
- <ArgumentName>+set r_customWidth </ArgumentName>
- <Menu>
- <Entry>
- <Name>1024</Name>
- <Value>1024</Value>
- </Entry>
- <Entry>
- <Name>1280</Name>
- <Value>1280</Value>
- </Entry>
- <Entry>
- <Name>1680</Name>
- <Value>1680</Value>
- </Entry>
- </Menu>
- </Option>
- <Option>
- <DisplayName>Resolution (Height)</DisplayName>
- <Identifier>height-resolution</Identifier>
- <ArgumentName>+set r_customHeight </ArgumentName>
- <Menu>
- <Entry>
- <Name>768</Name>
- <Value>768</Value>
- </Entry>
- <Entry>
- <Name>1024</Name>
- <Value>1024</Value>
- </Entry>
- <Entry>
- <Name>1050</Name>
- <Value>1050</Value>
+ <Name>1680 x 1050</Name>
+ <Value>+set r_customWidth 1680 +set r_customHeight 1050</Value>
</Entry>
</Menu>
</Option>
<Option>
- <DisplayName>In-Game</DisplayName>
+ <DisplayName>Quality</DisplayName>
<Identifier>game-quality</Identifier>
<ArgumentName>+set com_machineSpec </ArgumentName>
<Menu>
<Entry>
- <Name>Low Quality</Name>
+ <Name>Low</Name>
<Value>0</Value>
</Entry>
<Entry>
- <Name>High Quality</Name>
+ <Name>High</Name>
<Value>2</Value>
</Entry>
<Entry>
- <Name>Ultra Quality</Name>
+ <Name>Ultra</Name>
<Value>3</Value>
</Entry>
</Menu>
diff --git a/pts/benchmark-profiles/etqw.xml b/pts/benchmark-profiles/etqw.xml
index f699136..d9a250f 100644
--- a/pts/benchmark-profiles/etqw.xml
+++ b/pts/benchmark-profiles/etqw.xml
@@ -13,44 +13,16 @@
<Identifier>etqw</Identifier>
<Executable>etqw</Executable>
<TimesToRun>3</TimesToRun>
- <PreRunMessage>Due to a current limitation of Nexuiz, once the benchmark has completed you hit the quit button to leave the game.</PreRunMessage>
<ResultScale>FPS</ResultScale>
<Description>This test calculates the average frame-rate within the ET:QW game.</Description>
<Notes> </Notes>
</Information>
<Settings>
<Default>
- <Arguments>+timenetdemo pts +set r_mode -1</Arguments>
+ <Arguments>+exec etqw-pts.cfg +set sys_VideoRam $VIDEO_MEMORY +set r_mode -1 +timenetdemo pts</Arguments>
<PossiblePaths></PossiblePaths>
</Default>
<Option>
- <DisplayName>Video RAM</DisplayName>
- <Identifier>video-ram</Identifier>
- <ArgumentName>+set sys_VideoRam </ArgumentName>
- <Menu>
- <Entry>
- <Name>128MB</Name>
- <Value>128</Value>
- </Entry>
- <Entry>
- <Name>256MB</Name>
- <Value>256</Value>
- </Entry>
- <Entry>
- <Name>512MB</Name>
- <Value>512</Value>
- </Entry>
- <Entry>
- <Name>640MB</Name>
- <Value>640</Value>
- </Entry>
- <Entry>
- <Name>1GB</Name>
- <Value>1024</Value>
- </Entry>
- </Menu>
- </Option>
- <Option>
<DisplayName>Resolution</DisplayName>
<Identifier>display-resolution</Identifier>
<ArgumentName></ArgumentName>
diff --git a/pts/benchmark-resources/doom3/doom3-pts.cfg b/pts/benchmark-resources/doom3/doom3-pts.cfg
new file mode 100755
index 0000000..aae9964
--- /dev/null
+++ b/pts/benchmark-resources/doom3/doom3-pts.cfg
@@ -0,0 +1,141 @@
+unbindall
+bind "ESCAPE" "togglemenu"
+seta com_product_lang_ext "1"
+seta sv_punkbuster "0"
+seta cl_punkbuster "0"
+seta com_showFPS "0"
+seta com_purgeAll "0"
+seta com_preloadDemos "0"
+seta com_compressDemos "1"
+seta m_strafeSmooth "4"
+seta m_smooth "1"
+seta m_strafeScale "6.25"
+seta m_yaw "0.022"
+seta m_pitch "0.022"
+seta sensitivity "5"
+seta in_toggleZoom "0"
+seta in_toggleCrouch "0"
+seta in_toggleRun "0"
+seta in_alwaysRun "0"
+seta in_freeLook "1"
+seta in_anglespeedkey "1.5"
+seta in_pitchspeed "140"
+seta in_yawspeed "140"
+seta gui_configServerRate "0"
+seta com_guid "ovjx6brBRRU"
+seta net_clientDownload "1"
+seta net_master4 ""
+seta net_master3 ""
+seta net_master2 ""
+seta net_master1 ""
+seta net_clientMaxRate "16000"
+seta net_serverMaxClientRate "16000"
+seta gui_filter_game "0"
+seta gui_filter_idle "0"
+seta gui_filter_gameType "0"
+seta gui_filter_players "0"
+seta gui_filter_password "0"
+seta image_downSizeLimit "256"
+seta image_ignoreHighQuality "1"
+seta image_downSizeBumpLimit "256"
+seta image_downSizeSpecularLimit "64"
+seta image_downSizeBump "1"
+seta image_downSizeSpecular "1"
+seta image_useCache "0"
+seta image_cacheMegs "20"
+seta image_cacheMinK "200"
+seta image_usePrecompressedTextures "1"
+seta image_useNormalCompression "2"
+seta image_useAllFormats "1"
+seta image_useCompression "1"
+seta image_preload "1"
+seta image_roundDown "1"
+seta image_forceDownSize "0"
+seta image_downSize "1"
+seta image_lodbias "0"
+seta image_anisotropy "0"
+seta image_filter "GL_LINEAR_MIPMAP_LINEAR"
+seta r_debugArrowStep "120"
+seta r_debugLineWidth "1"
+seta r_debugLineDepthTest "0"
+seta r_cgFragmentProfile "best"
+seta r_cgVertexProfile "best"
+seta r_forceLoadImages "0"
+seta r_shadows "1"
+seta r_skipBump "0"
+seta r_skipSpecular "0"
+seta r_skipNewAmbient "0"
+seta r_renderer "best"
+seta r_brightness "1"
+seta r_gamma "1"
+seta r_swapInterval "0"
+seta r_useIndexBuffers "0"
+seta r_fullscreen "1"
+seta r_multiSamples "0"
+seta gui_mediumFontLimit "0.60"
+seta gui_smallFontLimit "0.30"
+seta s_libOpenAL "openal32.dll"
+seta s_numberOfSpeakers "6"
+seta s_doorDistanceAdd "150"
+seta s_globalFraction "0.8"
+seta s_subFraction "0.75"
+seta s_playDefaultSound "1"
+seta s_volume_dB "0"
+seta s_meterTopTime "2000"
+seta s_reverse "0"
+seta s_spatializationDecay "2"
+seta s_maxSoundsPerShader "1"
+seta sys_lang "english"
+seta in_dgamouse "1"
+seta in_mouse "1"
+seta s_dsp "/dev/dsp"
+seta s_driver "alsa"
+seta s_alsa_lib "libasound.so.2"
+seta s_alsa_pcm "default"
+seta g_decals "1"
+seta g_projectileLights "1"
+seta g_doubleVision "1"
+seta g_muzzleFlash "1"
+seta net_clientLagOMeter "1"
+seta g_spectatorChat "0"
+seta net_serverDlTable ""
+seta net_serverDlBaseURL ""
+seta net_serverDownload "0"
+seta mod_validSkins "skins/characters/player/marine_mp;skins/characters/player/marine_mp_green;skins/characters/player/marine_mp_blue;skins/characters/player/marine_mp_red;skins/characters/player/marine_mp_yellow"
+seta g_mapCycle "mapcycle"
+seta g_voteFlags "0"
+seta g_gameReviewPause "10"
+seta g_countDown "10"
+seta g_password ""
+seta g_showBrass "1"
+seta g_showProjectilePct "0"
+seta g_showHud "1"
+seta g_showPlayerShadow "0"
+seta g_showcamerainfo "0"
+seta g_healthTakeLimit "25"
+seta g_healthTakeAmt "5"
+seta g_healthTakeTime "5"
+seta g_useDynamicProtection "1"
+seta g_armorProtectionMP "0.6"
+seta g_armorProtection "0.3"
+seta g_damageScale "1"
+seta g_nightmare "0"
+seta g_bloodEffects "1"
+seta r_aspectRatio "0"
+seta ui_showGun "1"
+seta ui_autoReload "1"
+seta ui_autoSwitch "1"
+seta ui_team "Red"
+seta ui_skin "skins/characters/player/marine_mp"
+seta ui_name "Player"
+seta si_serverURL ""
+seta si_spectators "1"
+seta si_usePass "0"
+seta si_warmup "0"
+seta si_teamDamage "0"
+seta si_timeLimit "10"
+seta si_fragLimit "10"
+seta si_maxPlayers "4"
+seta si_map "game/mp/d3dm1"
+seta si_gameType "singleplayer"
+seta si_name "DOOM Server"
diff --git a/pts/benchmark-resources/doom3/install.sh b/pts/benchmark-resources/doom3/install.sh
index 512bce8..07435a8 100755
--- a/pts/benchmark-resources/doom3/install.sh
+++ b/pts/benchmark-resources/doom3/install.sh
@@ -1,5 +1,6 @@
#!/bin/sh
+cp -f doom3-pts.cfg $1
cd $1
if [ ! -f doom3-linux.run ]
@@ -11,6 +12,7 @@ chmod +x doom3-linux.run
./doom3-linux.run --noexec --target .
ln bin/Linux/x86/doom.x86 doom3-real
+mv -f doom3-pts.cfg base/doom3-pts.cfg
echo "#!/bin/sh
./doom3-real \$@ | grep fps" > doom3
diff --git a/pts/benchmark-resources/etqw/install.sh b/pts/benchmark-resources/etqw/install.sh
index 0a435e2..77390bd 100755
--- a/pts/benchmark-resources/etqw/install.sh
+++ b/pts/benchmark-resources/etqw/install.sh
@@ -10,10 +10,10 @@ fi
chmod +x etqw-linux.run
unzip -o etqw-linux.run
-ln data/etqw.x86 etqw-real
echo "#!/bin/sh
-./etqw-real \$@ | grep fps" > etqw
+cd data
+./etqw.x86 $@ | grep fps" > etqw
chmod +x etqw
if [ ! -f etqw
Copyright © 2010 by Phoronix Media