diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-12-05 17:46:42 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-12-05 17:46:42 -0500 |
| commit | 253c6841ecf315bb068d39e8071146590639ebec (patch) | |
| tree | 0b84d5c65fe23382e2f04fe07d180590c10298b4 /pts-core/functions/pts-functions-merge.php | |
| parent | a109aa2766f33a4ec332b4e1a70095ecfce8f572 (diff) | |
| download | phoronix-test-suite-upstream-253c6841ecf315bb068d39e8071146590639ebec.tar.gz phoronix-test-suite-upstream-253c6841ecf315bb068d39e8071146590639ebec.tar.xz phoronix-test-suite-upstream-253c6841ecf315bb068d39e8071146590639ebec.zip | |
pts-core: Allow multiple tests/suites/identifiers to be passed using the
run and benchmark options
Diffstat (limited to 'pts-core/functions/pts-functions-merge.php')
| -rw-r--r-- | pts-core/functions/pts-functions-merge.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pts-core/functions/pts-functions-merge.php b/pts-core/functions/pts-functions-merge.php index 8d81fd8..1424486 100644 --- a/pts-core/functions/pts-functions-merge.php +++ b/pts-core/functions/pts-functions-merge.php @@ -103,7 +103,7 @@ function pts_merge_test_results($OLD_RESULTS, $NEW_RESULTS) } unset($OLD_RESULTS, $original_xml_reader, $original_results_raw); - if(!pts_is_assignment("GLOBAL_COMPARISON") && getenv("PTS_MERGE") != "custom") + /*if(!pts_is_assignment("GLOBAL_COMPARISON") && getenv("PTS_MERGE") != "custom") { if($original_suite_name != $new_suite_name && !pts_global_valid_id_string($original_suite_name) && !pts_global_valid_id_string($new_suite_name)) { @@ -113,7 +113,7 @@ function pts_merge_test_results($OLD_RESULTS, $NEW_RESULTS) { // echo "Merge Failed! The test versions don't match: $original_suite_version - $new_suite_version\n"; } - } + }*/ // Write the new merge |