Drizzle

Merge lp:~brianaker/drizzle/test_run_valgrind into lp:drizzle

  1. test_run_valgrind
  2. Merge into 7.2
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: 2540
Merged at revision: 2544
Proposed branch: lp:~brianaker/drizzle/test_run_valgrind
Merge into: lp:drizzle
Diff against target: 25 lines (+7/-1)
1 file modified
tests/test-run.pl (+7/-1)
To merge this branch: bzr merge lp:~brianaker/drizzle/test_run_valgrind
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+101192@code.launchpad.net
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
1=== modified file 'tests/test-run.pl'
2--- tests/test-run.pl 2011-10-06 18:24:46 +0000
3+++ tests/test-run.pl 2012-04-08 00:52:20 +0000
4@@ -258,7 +258,8 @@
5
6 our $opt_user;
7
8-my $opt_valgrind= 0;
9+my $test_environment= $ENV{'TESTS_ENVIRONMENT'}; # Assume valgrind
10+my $opt_valgrind;
11 my $opt_valgrind_drizzled= 0;
12 my $opt_valgrind_drizzletest= 0;
13 my $opt_valgrind_drizzleslap= 0;
14@@ -342,6 +343,11 @@
15
16 sub main () {
17
18+ if ($test_environment)
19+ {
20+ $opt_valgrind= $test_environment =~ m/valgrind/;
21+ }
22+
23 command_line_setup();
24
25 check_debug_support(\%drizzled_variables);

Subscribers

People subscribed via source and target branches

to all changes: