summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGE-LOG1
-rw-r--r--pts-core/functions/pts-functions.php3
-rw-r--r--pts-core/functions/pts-functions_config.php6
-rw-r--r--pts-core/functions/pts-interfaces.php2
4 files changed, 12 insertions, 0 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index 1ad5921..d176452 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -21,6 +21,7 @@ Phoronix Test Suite
- pts-core: Create end-user variables for having software/hardware values when saving the results and setting the test identifier
- pts-core: ~/.phoronix-test-suite/local/ -> ~/.phoronix-test-suite/module-files/ for files used or generated by PTS modules
- pts-core: If running a test suite and some tests failed to install (such as not being supported by the architecture), continue to let the test suite run with the tests that are installed when using the benchmark or batch-benchmark option instead of exiting.
+- pts-core: Write the PTS version to the last run version upon exiting in the Phoronix Test Suite user-config.xml file
- pts: Update mandrivalinux-packages.xml from Stéphane Téletchéa
- pts: Add the unigine test suite for OpenGL tech demo tests from Unigine Corp
- pts: Fix tests in java-opengl test suite
diff --git a/pts-core/functions/pts-functions.php b/pts-core/functions/pts-functions.php
index 78a265b..4a347e4 100644
--- a/pts-core/functions/pts-functions.php
+++ b/pts-core/functions/pts-functions.php
@@ -529,6 +529,9 @@ function pts_shutdown()
// Shutdown process for PTS
define("PTS_END_TIME", time());
+ // Re-run the config file generation to save the last run version
+ pts_user_config_init();
+
if(IS_DEBUG_MODE && defined("PTS_DEBUG_FILE"))
{
if(!is_dir(PTS_USER_DIR . "debug-messages/"))
diff --git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php
index 20c66a5..5863ac1 100644
--- a/pts-core/functions/pts-functions_config.php
+++ b/pts-core/functions/pts-functions_config.php
@@ -86,6 +86,10 @@ function pts_user_config_init($UserName = NULL, $UploadKey = NULL, $BatchOptions
$BatchOptions[6] = "TRUE";
}
+ // Determine last version run of the Phoronix Test Suite
+ $last_version = pts_read_user_config(P_OPTION_TESTCORE_LASTVERSION, PTS_VERSION, $read_config);
+ if(defined("PTS_END_TIME") && !defined("PTS_EXIT") && $last_version != PTS_VERSION)
+ $last_version = PTS_VERSION;
$config = new tandem_XmlWriter();
$config->addXmlObject(P_OPTION_GLOBAL_USERNAME, 0, $UserName);
@@ -113,6 +117,8 @@ function pts_user_config_init($UserName = NULL, $UploadKey = NULL, $BatchOptions
$config->addXmlObject(P_OPTION_USER_AGREEMENT, 6, $UserAgreement_MD5);
$config->addXmlObject(P_OPTION_LOAD_MODULES, 6, pts_read_user_config(P_OPTION_LOAD_MODULES, "", $read_config));
+ $config->addXmlObject(P_OPTION_TESTCORE_LASTVERSION, 7, $last_version);
+
file_put_contents(PTS_USER_DIR . "user-config.xml", $config->getXML());
}
function pts_config_bool_to_string($bool)
diff --git a/pts-core/functions/pts-interfaces.php b/pts-core/functions/pts-interfaces.php
index 873d104..994af44 100644
--- a/pts-core/functions/pts-interfaces.php
+++ b/pts-core/functions/pts-interfaces.php
@@ -169,6 +169,8 @@ define("P_OPTION_LOG_VSYSDETAILS", "PhoronixTestSuite/Options/TestResults/LogVer
define("P_OPTION_USER_AGREEMENT", "PhoronixTestSuite/Options/General/UserAgreement"); // PTS user agreement confirmation
define("P_OPTION_LOAD_MODULES", "PhoronixTestSuite/Options/General/LoadModules"); // Modules to load by default
+define("P_OPTION_TESTCORE_LASTVERSION", "PhoronixTestSuite/TestCore/LastRun/Version"); // Last version of the Phoronix Test Suite Run
+
//
// TEST INSTALLATION SPECIFICATION
//