Rev 11309: convert testenv.sh to perl. in file:///home/jelmer/bzr.samba/4.0-perlselftest/

Jelmer Vernooij jelmer at samba.org
Thu Feb 1 14:06:56 GMT 2007


At file:///home/jelmer/bzr.samba/4.0-perlselftest/

------------------------------------------------------------
revno: 11309
revision-id: jelmer at samba.org-20070201140646-jjupoe5w0no3fm00
parent: jelmer at samba.org-20070201131646-x23y1edlqu155prz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-perlselftest
timestamp: Thu 2007-02-01 15:06:46 +0100
message:
  convert testenv.sh to perl.
renamed:
  source/script/tests/testenv.sh => source/script/tests/testenv.pl testenv.sh-20070201114140-yqamcl9g11yeseoc-1
modified:
  source/main.mk                 svn-v2:8991 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fmain.mk
  source/script/tests/selftest.pl svn-v2:20693 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fselftest.pl
  source/script/tests/testenv.pl testenv.sh-20070201114140-yqamcl9g11yeseoc-1
=== renamed file 'source/script/tests/testenv.sh' => 'source/script/tests/testenv.pl'
--- a/source/script/tests/testenv.sh	2007-02-01 12:16:01 +0000
+++ b/source/script/tests/testenv.pl	2007-02-01 14:06:46 +0000
@@ -1,9 +1,13 @@
-#!/bin/sh
-PREFIX=$1
-shift 1
-for I in `./script/tests/mktestsetup.sh $PREFIX`
-do
-	eval $I
-	export `echo $I | cut -d = -f 1`
-done
-xterm
+#!/usr/bin/perl
+
+my $prefix = "st";
+
+open(VARS, "./script/tests/mktestsetup.sh $prefix|") or die("Unable to run mktestsetup");
+while (<VARS>) {
+	next unless (/^([A-Z_]+)=(.*)$/);
+	$ENV{$1} = $2;
+}
+close(VARS);
+
+system("xterm");
+

=== modified file 'source/main.mk'
--- a/source/main.mk	2007-02-01 13:16:46 +0000
+++ b/source/main.mk	2007-02-01 14:06:46 +0000
@@ -301,14 +301,14 @@
 test-noswrap: all libraries
 	$(SELFTEST) $(TESTS)
 
-quicktestone:
+quicktestone: all
 	$(SELFTEST) --quick --socket-wrapper --one $(TESTS)
 
 quicktest: all
 	$(SELFTEST) --quick --socket-wrapper $(TESTS)
 
 testenv: all libraries
-	$(srcdir)/script/tests/testenv.sh
+	$(srcdir)/script/tests/testenv.pl 
 
 valgrindtest: valgrindtest-quick
 

=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl	2007-02-01 12:32:42 +0000
+++ b/source/script/tests/selftest.pl	2007-02-01 14:06:46 +0000
@@ -466,8 +466,6 @@
 {
 	$socket_wrapper_dir = prepare_socket_wrapper($prefix);
 	print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
-} else {
-	print "NOT USING SOCKET_WRAPPER\n";
 }
 
 # Start slapd before smbd



More information about the samba-cvs mailing list