diff options
| author | Michael Larabel <michael@phx-laptop.(none)> | 2008-12-11 09:52:00 -0500 |
|---|---|---|
| committer | Michael Larabel <michael@phx-laptop.(none)> | 2008-12-11 09:52:00 -0500 |
| commit | f99aac76617d267aed15b365bc6ac9ac2b35525b (patch) | |
| tree | 4ce67bd3a2f9592ead7754a98a1615ce8f58550f /pts-core | |
| parent | 49c0cf8d23be4a80b3622457b85a5f00d5160a1a (diff) | |
| download | phoronix-test-suite-upstream-f99aac76617d267aed15b365bc6ac9ac2b35525b.tar.gz phoronix-test-suite-upstream-f99aac76617d267aed15b365bc6ac9ac2b35525b.tar.xz phoronix-test-suite-upstream-f99aac76617d267aed15b365bc6ac9ac2b35525b.zip | |
pts-core: Verify Attributes tag matches (instead of just the Arguments
tag) when merging results
Diffstat (limited to 'pts-core')
| -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 d13b40c..4318ca0 100644 --- a/pts-core/functions/pts-functions-merge.php +++ b/pts-core/functions/pts-functions-merge.php @@ -148,7 +148,7 @@ function pts_merge_test_results($original_results_file, $new_results_file) $result_merged = false; for($r_n = 0; $r_n < count($new_results_identifiers) && !$result_merged; $r_n++) { - if(!empty($original_results_identifiers[$r_o]) && !empty($new_results_identifiers[$r_n]) && $original_results_testname[$r_o] == $new_results_testname[$r_n] && $original_results_arguments[$r_o] == $new_results_arguments[$r_n] && pts_version_comparable($original_results_version[$r_o], $new_results_version[$r_n])) + if(!empty($original_results_identifiers[$r_o]) && !empty($new_results_identifiers[$r_n]) && $original_results_testname[$r_o] == $new_results_testname[$r_n] && $original_results_arguments[$r_o] == $new_results_arguments[$r_n] && $original_results_attributes[$r_o] == $new_results_attributes[$r_n] && pts_version_comparable($original_results_version[$r_o], $new_results_version[$r_n])) { $USE_ID = pts_request_new_id(); $RESULTS->addXmlObject(P_RESULTS_TEST_TITLE, $USE_ID, $original_results_name[$r_o]); |