diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-10-06 19:07:53 -0400 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-10-06 19:07:53 -0400 |
| commit | 7ce8686cb414f28699de884aa939b73dbea578b9 (patch) | |
| tree | 2ece6ce37345658d89c45afadcbdb9fa12017741 /pts-core/functions/pts-functions-merge.php | |
| parent | 3aac02f20a1d60c28127475535596e09935d7f8e (diff) | |
| download | phoronix-test-suite-upstream-7ce8686cb414f28699de884aa939b73dbea578b9.tar.gz phoronix-test-suite-upstream-7ce8686cb414f28699de884aa939b73dbea578b9.tar.xz phoronix-test-suite-upstream-7ce8686cb414f28699de884aa939b73dbea578b9.zip | |
pts-core: Don't complain about test mismatch in merge function if using
a Global ID
Diffstat (limited to 'pts-core/functions/pts-functions-merge.php')
| -rw-r--r-- | pts-core/functions/pts-functions-merge.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pts-core/functions/pts-functions-merge.php b/pts-core/functions/pts-functions-merge.php index 904359d..3c83e12 100644 --- a/pts-core/functions/pts-functions-merge.php +++ b/pts-core/functions/pts-functions-merge.php @@ -101,7 +101,7 @@ function pts_merge_test_results($OLD_RESULTS, $NEW_RESULTS) if(!defined("GLOBAL_COMPARISON") && getenv("PTS_MERGE") != "custom") { - if($original_suite_name != $new_suite_name) + if($original_suite_name != $new_suite_name && !pts_global_valid_id_string($original_suite_name) && !pts_global_valid_id_string($new_suite_name)) { echo pts_string_header("Note: The test(s) don't match: " . $original_suite_name . " - " . $new_suite_name . ".\nNot all test results may be compatible."); } |