summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My/SafeProcess.pm
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2008-01-18 00:03:38 +0100
committerunknown <msvensson@shellback.(none)>2008-01-18 00:03:38 +0100
commit02a784efeaf8e7096e4ca7c07fb6fcd3076326f9 (patch)
treecab088b09ffd9873cd35e1754d45bbc292c6af00 /mysql-test/lib/My/SafeProcess.pm
parentbd172e5044e6666e21540d0ad56c3c9d77051246 (diff)
downloadmariadb-git-02a784efeaf8e7096e4ca7c07fb6fcd3076326f9.tar.gz
Add C version of safe_process
BitKeeper/etc/ignore: Added mysql-test/lib/My/SafeProcess/my_safe_process to the ignore list configure.in: Add Makefile to build safe_process mysql-test/Makefile.am: Build lib/My/SafeProcess mysql-test/lib/My/SafeProcess.pm: Use C version of safe_process mysql-test/lib/t/SafeProcessStress.pl: Decrease number of loops mysql-test/lib/My/SafeProcess/Makefile.am: New BitKeeper file ``mysql-test/lib/My/SafeProcess/Makefile.am'' mysql-test/lib/My/SafeProcess/safe_process.cc: New BitKeeper file ``mysql-test/lib/My/SafeProcess/safe_process.cc''
Diffstat (limited to 'mysql-test/lib/My/SafeProcess.pm')
-rw-r--r--mysql-test/lib/My/SafeProcess.pm35
1 files changed, 24 insertions, 11 deletions
diff --git a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm
index 612096cceb7..ef3ba9146d1 100644
--- a/mysql-test/lib/My/SafeProcess.pm
+++ b/mysql-test/lib/My/SafeProcess.pm
@@ -90,22 +90,35 @@ my @safe_process_cmd;
my $safe_kill;
if (IS_WIN32PERL or IS_CYGWIN){
# Use my_safe_process.exe
- my $exe= my_find_bin(".", "lib/My/SafeProcess", "my_safe_process.exe");
- die "Could not find my_safe_process.exe" unless $exe;
+ my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
+ "my_safe_process");
+ die "Could not find my_safe_process" unless $exe;
push(@safe_process_cmd, $exe);
# Use my_safe_kill.exe
my $safe_kill= my_find_bin(".", "lib/My/SafeProcess", "my_safe_kill");
- die "Could not find my_safe_kill.exe" unless $safe_kill;
+ die "Could not find my_safe_kill" unless $safe_kill;
}
-else {
- # Use safe_process.pl
- my $script= "lib/My/SafeProcess/safe_process.pl";
- $script= "../$script" unless -f $script;
- die "Could not find safe_process.pl" unless -f $script;
-
- # Call $script with Perl interpreter
- push(@safe_process_cmd, $^X, $script);
+else
+{
+ my $use_safe_process_binary= 1;
+ if ($use_safe_process_binary) {
+ # Use my_safe_process
+ my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"],
+ "my_safe_process");
+ die "Could not find my_safe_process" unless $exe;
+ push(@safe_process_cmd, $exe);
+ }
+ else
+ {
+ # Use safe_process.pl
+ my $script= "lib/My/SafeProcess/safe_process.pl";
+ $script= "../$script" unless -f $script;
+ die "Could not find safe_process.pl" unless -f $script;
+
+ # Call $script with Perl interpreter
+ push(@safe_process_cmd, $^X, $script);
+ }
}