]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Change s/\R//g to chomp().
authorScott Mann <smann@isc.org>
Mon, 10 Oct 2011 23:18:17 +0000 (23:18 +0000)
committerScott Mann <smann@isc.org>
Mon, 10 Oct 2011 23:18:17 +0000 (23:18 +0000)
bin/tests/system/start.pl

index e6ffe53c276110c2bf387a40974f7b09f0f47d94..1fa4c96de2811290ceecbede46d193aed13826cf 100644 (file)
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: start.pl,v 1.26 2011/10/10 19:06:05 smann Exp $
+# $Id: start.pl,v 1.27 2011/10/10 23:18:17 smann Exp $
 
 # Framework for starting test servers.
 # Based on the type of server specified, check for port availability, remove
@@ -145,7 +145,8 @@ sub start_server {
                        open(FH, "<", $args_file);
                        while(my $line=<FH>)
                        {
-                               $line =~ s/\R//g;
+                               #$line =~ s/\R//g;
+                               chomp $line;
                                next if ($line =~ /^\s*$/); #discard blank lines
                                next if ($line =~ /^\s*#/); #discard comment lines
                                $line =~ s/#.*$//g;