diff options
author | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-30 20:00:21 -0500 |
---|---|---|
committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-30 20:00:21 -0500 |
commit | 260ff17a89a15ad897d4e0a4c060510686d55030 (patch) | |
tree | 0ed8e30086e407b0dc9cb5a18bf78aea53031a23 /pts-core/functions/pts-functions-sctp.php | |
parent | 068c038200c3fedc39b3a1fa28724eff115a79ec (diff) | |
download | phoronix-test-suite-upstream-260ff17a89a15ad897d4e0a4c060510686d55030.tar.gz phoronix-test-suite-upstream-260ff17a89a15ad897d4e0a4c060510686d55030.tar.xz phoronix-test-suite-upstream-260ff17a89a15ad897d4e0a4c060510686d55030.zip |
pts-core: Major Self-Contained Test Profile (SCTP) update. Also adds in
convert-test-to-sctp option.
Diffstat (limited to 'pts-core/functions/pts-functions-sctp.php')
-rw-r--r-- | pts-core/functions/pts-functions-sctp.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pts-core/functions/pts-functions-sctp.php b/pts-core/functions/pts-functions-sctp.php index 5ece9d5..ce0a377 100644 --- a/pts-core/functions/pts-functions-sctp.php +++ b/pts-core/functions/pts-functions-sctp.php @@ -23,7 +23,7 @@ function pts_sctp_test_directory() { - return PTS_TEMP_DIR . "sctp/" . basename(SCTP_FILE) . "/"; + return SCTP_DIR . basename(SCTP_FILE, ".sctp") . "/"; } function pts_remove_sctp_test_files() { @@ -39,16 +39,15 @@ function pts_generate_sctp_layer() pts_exit("\n" . SCTP_FILE . " is not a valid self-contained test profile!\n"); } - if(!is_dir(PTS_TEMP_DIR . "sctp/")) - { - mkdir(PTS_TEMP_DIR . "sctp/"); - } if(!is_dir($test_directory)) { mkdir($test_directory); } - $sctp_stages = array("install" => P_TEST_SCTP_INSTALLSCRIPT, "downloads" => P_TEST_SCTP_DOWNLOADS, "parse-results" => P_TEST_SCTP_RESULTSPARSER, "pre" => P_TEST_SCTP_PRERUN, "post" => P_TEST_SCTP_POSTRUN); + $sctp_stages = array("install" => P_TEST_SCTP_INSTALLSCRIPT, "downloads" => P_TEST_SCTP_DOWNLOADS, "parse-results" => P_TEST_SCTP_RESULTSPARSER, + "pre" => P_TEST_SCTP_PRERUN, "interim" => P_TEST_SCTP_INTERIMRUN, "post" => P_TEST_SCTP_POSTRUN, "validate-result" => P_TEST_SCTP_VALIDATE_RESULT, + "validate-install" => P_TEST_SCTP_VALIDATE_INSTALL); + foreach($sctp_stages as $stage_file => $stage_point) { $object = $xml_parser->getXMLValue($stage_point); |