diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-07 21:57:33 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-11-13 10:34:15 -0500 |
| commit | fef8c13129125d6516189bd1f6be88358661aa58 (patch) | |
| tree | e1ee6de835447c10ef6826d00e90138c008de73a /pts-core/functions/pts-functions-merge.php | |
| parent | f219a4f7e683c4e14966c341dfa08fdbee5fd508 (diff) | |
| download | phoronix-test-suite-upstream-fef8c13129125d6516189bd1f6be88358661aa58.tar.gz phoronix-test-suite-upstream-fef8c13129125d6516189bd1f6be88358661aa58.tar.xz phoronix-test-suite-upstream-fef8c13129125d6516189bd1f6be88358661aa58.zip | |
pts-core: Start moving some of the define statements to PTS assignment
statements
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 09db138..570854a 100644 --- a/pts-core/functions/pts-functions-merge.php +++ b/pts-core/functions/pts-functions-merge.php @@ -99,7 +99,7 @@ function pts_merge_test_results($OLD_RESULTS, $NEW_RESULTS) } unset($OLD_RESULTS, $original_xml_reader, $original_results_raw); - if(!defined("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)) { |