diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-05-30 19:12:19 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-05-30 19:12:19 -0400 |
| commit | c27a907a02439fe4a5bf9bed9bf648b44cc75653 (patch) | |
| tree | 1a86b4f064054de8cb293ab48f125c082815eb10 /pts-core/functions/pts-functions-merge.php | |
| parent | db38764aad336ca84b4276bd1408f92bec04a1ec (diff) | |
| download | phoronix-test-suite-upstream-c27a907a02439fe4a5bf9bed9bf648b44cc75653.tar.gz phoronix-test-suite-upstream-c27a907a02439fe4a5bf9bed9bf648b44cc75653.tar.xz phoronix-test-suite-upstream-c27a907a02439fe4a5bf9bed9bf648b44cc75653.zip | |
If PTS_MERGE environmental variable is set to "custom", don't perform
compatibility checks when merging / allow anything to happen.
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 45fa1ca..02eb49b 100644 --- a/pts-core/functions/pts-functions-merge.php +++ b/pts-core/functions/pts-functions-merge.php @@ -98,7 +98,7 @@ function pts_merge_benchmarks($OLD_RESULTS, $NEW_RESULTS) } unset($OLD_RESULTS, $original_xml_reader, $original_results_raw); - if(!defined("GLOBAL_COMPARISON")) + if(!defined("GLOBAL_COMPARISON") && getenv("PTS_MERGE") != "custom") { if($original_suite_name != $new_suite_name) { @@ -138,7 +138,7 @@ function pts_merge_benchmarks($OLD_RESULTS, $NEW_RESULTS) } else { - if(!pts_version_comparable($original_pts_version[0], $new_pts_version[0])) + if(!pts_version_comparable($original_pts_version[0], $new_pts_version[0]) && getenv("PTS_MERGE") != "custom") echo pts_string_header("PTS Versions Do Not Match! For accurate results, you should only test against the same version!"); for($i = 0; $i < count($original_system_hardware); $i++) |