Merge lp://qastaging/~patrick-crews/drizzle/bug697292 into lp://qastaging/drizzle/7.0

Proposed by Patrick Crews
Status: Merged
Approved by: Brian Aker
Approved revision: 2082
Merged at revision: 2087
Proposed branch: lp://qastaging/~patrick-crews/drizzle/bug697292
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 322 lines (+34/-32)
30 files modified
plugin/pbms/tests/t/basic.test (+1/-1)
plugin/pbms/tests/t/bug616466_auto_increment_crash.test (+1/-1)
plugin/pbxt/tests/t/basic_auto_increment.test (+1/-1)
plugin/pbxt/tests/t/basic_create_nullable.test (+1/-1)
plugin/pbxt/tests/t/basic_create_select.test (+1/-1)
plugin/pbxt/tests/t/basic_create_table.test (+1/-1)
plugin/pbxt/tests/t/basic_create_with_index.test (+1/-1)
plugin/pbxt/tests/t/basic_delete_all_rows.test (+1/-1)
plugin/pbxt/tests/t/basic_delete_row.test (+1/-1)
plugin/pbxt/tests/t/basic_drop_table.test (+1/-1)
plugin/pbxt/tests/t/basic_index_lookup.test (+1/-1)
plugin/pbxt/tests/t/basic_innodb_truncate_table.test (+1/-1)
plugin/pbxt/tests/t/basic_insert.test (+1/-1)
plugin/pbxt/tests/t/basic_insert_multi_column.test (+1/-1)
plugin/pbxt/tests/t/basic_insert_pkey_duplicate.test (+1/-1)
plugin/pbxt/tests/t/basic_pkey_index_reverse_scan.test (+1/-1)
plugin/pbxt/tests/t/basic_pkey_index_scan.test (+1/-1)
plugin/pbxt/tests/t/basic_rename_table.test (+1/-1)
plugin/pbxt/tests/t/basic_select.test (+1/-1)
plugin/pbxt/tests/t/basic_select_multirow.test (+1/-1)
plugin/pbxt/tests/t/basic_show_tables.test (+1/-1)
plugin/pbxt/tests/t/basic_transaction.test (+1/-1)
plugin/pbxt/tests/t/basic_transaction_autocommit.test (+1/-1)
plugin/pbxt/tests/t/basic_transaction_rollback.test (+1/-1)
plugin/pbxt/tests/t/basic_type_decimal.test (+1/-1)
plugin/pbxt/tests/t/basic_update.test (+1/-1)
plugin/pbxt/tests/t/basic_with_indexes.test (+1/-1)
tests/include/not_valgrind.inc (+4/-4)
tests/r/have_valgrind.require (+1/-1)
tests/r/not_valgrind.require (+2/-0)
To merge this branch: bzr merge lp://qastaging/~patrick-crews/drizzle/bug697292
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+46290@code.qastaging.launchpad.net

Description of the change

Made updates to the include files
have_valgrind now means that the test will only run in valgrind runs
not_valgrind is used to mean that it will only run if we are !valgrind

Updated test cases using have_valgrind appropriately.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches