diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-10-04 22:03:17 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-10-04 22:03:17 -0400 |
| commit | 280da7fa136b913c4221455b83c25efc0786ec0e (patch) | |
| tree | 29e9c1fd48689165753cf8ceaeb7f262a27ea5ec /pts-core/functions | |
| parent | c137917c504c773ef8c4e6c4f4917e9cc45812f1 (diff) | |
| download | phoronix-test-suite-upstream-280da7fa136b913c4221455b83c25efc0786ec0e.tar.gz phoronix-test-suite-upstream-280da7fa136b913c4221455b83c25efc0786ec0e.tar.xz phoronix-test-suite-upstream-280da7fa136b913c4221455b83c25efc0786ec0e.zip | |
pts-core: Avoid overusing pts_exit() and replace with improved logic
Diffstat (limited to 'pts-core/functions')
| -rw-r--r-- | pts-core/functions/pts-functions-install.php | 4 | ||||
| -rw-r--r-- | pts-core/functions/pts-functions-merge.php | 2 | ||||
| -rw-r--r-- | pts-core/functions/pts-functions-sctp.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php index 70606b5..913486a 100644 --- a/pts-core/functions/pts-functions-install.php +++ b/pts-core/functions/pts-functions-install.php @@ -412,8 +412,8 @@ function pts_install_test($identifier) if(!empty($size) && ceil(disk_free_space(TEST_ENV_DIR) / 1048576) < $size) { - echo pts_string_header("There is not enough space (at " . TEST_ENV_DIR . ") for this test to be installed."); - pts_exit(); + echo "\nThere is not enough space (at " . TEST_ENV_DIR . ") for this test to be installed.\n"; + return FALSE; } $xml_parser = new pts_test_tandem_XmlReader(pts_location_test($identifier)); diff --git a/pts-core/functions/pts-functions-merge.php b/pts-core/functions/pts-functions-merge.php index f6a8129..904359d 100644 --- a/pts-core/functions/pts-functions-merge.php +++ b/pts-core/functions/pts-functions-merge.php @@ -107,7 +107,7 @@ function pts_merge_test_results($OLD_RESULTS, $NEW_RESULTS) } if($original_suite_version != $new_suite_version) { - //pts_exit("Merge Failed! The test versions don't match: $original_suite_version - $new_suite_version\n"); + // echo "Merge Failed! The test versions don't match: $original_suite_version - $new_suite_version\n"; } } diff --git a/pts-core/functions/pts-functions-sctp.php b/pts-core/functions/pts-functions-sctp.php index 2736d5f..f7d7256 100644 --- a/pts-core/functions/pts-functions-sctp.php +++ b/pts-core/functions/pts-functions-sctp.php @@ -35,7 +35,7 @@ function generate_sctp_layer() $test_directory = sctp_test_directory(); if(!$xml_parser->isDefined(P_TEST_TITLE)) - pts_exit("\n" . SCTP_FILE . " is not a valid self-contained test profile!\n"); + 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/"); |