Remove Mac OS Classic code from DosGlob.t

1 files changed, 27 insertions, 75 deletions

diff --git a/lib/File/DosGlob.t b/lib/File/DosGlob.t
index 32eb276003..34f93713c2 100644
--- a/lib/File/DosGlob.t
+++ b/lib/File/DosGlob.t
@@ -18,11 +18,7 @@ require Cwd;
 
 # test if $_ takes as the default
 my $expected;
-if ($^O eq 'MacOS') {
-    $expected = $_ = ":op:a*.t";
-} else {
-    $expected = $_ = "op/a*.t";
-}
+$expected = $_ = "op/a*.t";
 my @r = glob;
 print "not " if $_ ne $expected;
 print "ok 1\n";
@@ -30,11 +26,7 @@ print "# |@r|\nnot " if @r < 9;
 print "ok 2\n";
 
 # check if <*/*> works
-if ($^O eq 'MacOS') {
-    @r = <:*:a*.t>;
-} else {
-    @r = <*/a*.t>;
-}
+@r = <*/a*.t>;
 # atleast {argv,abbrev,anydbm,autoloader,append,arith,array,assignwarn,auto}.t
 print "# |@r|\nnot " if @r < 9;
 print "ok 3\n";
@@ -42,7 +34,7 @@ my $r = scalar @r;
 
 # check if scalar context works
 @r = ();
-while (defined($_ = ($^O eq 'MacOS') ? <:*:a*.t> : <*/a*.t>)) {
+while (defined($_ = <*/a*.t>)) {
     print "# $_\n";
     push @r, $_;
 }
@@ -51,39 +43,25 @@ print "ok 4\n";
 
 # check if list context works
 @r = ();
-if ($^O eq 'MacOS') {
-    for (<:*:a*.t>) {
-    	print "# $_\n";
-    	push @r, $_;
-    }
-} else {
-    for (<*/a*.t>) {
-    	print "# $_\n";
-    	push @r, $_;
-    }
+for (<*/a*.t>) {
+    print "# $_\n";
+    push @r, $_;
 }
 print "not " if @r != $r;
 print "ok 5\n";
 
 # test if implicit assign to $_ in while() works
 @r = ();
-if ($^O eq 'MacOS') {
-    while (<:*:a*.t>) {
-    	print "# $_\n";
-	push @r, $_;
-    }
-} else {
-    while (<*/a*.t>) {
-    	print "# $_\n";
-	push @r, $_;
-    }
+while (<*/a*.t>) {
+    print "# $_\n";
+    push @r, $_;
 }
 print "not " if @r != $r;
 print "ok 6\n";
 
 # test if explicit glob() gets assign magic too
 my @s = ();
-my $pat = ($^O eq 'MacOS') ? ':*:a*.t': '*/a*.t';
+my $pat = '*/a*.t';
 while (glob ($pat)) {
     print "# $_\n";
     push @s, $_;
@@ -95,7 +73,7 @@ print "ok 7\n";
 package Foo;
 use File::DosGlob 'glob';
 @s = ();
-$pat = $^O eq 'MacOS' ? ':*:a*.t' : '*/a*.t';
+$pat = '*/a*.t';
 while (glob($pat)) {
     print "# $_\n";
     push @s, $_;
@@ -105,28 +83,15 @@ print "ok 8\n";
 
 # test if different glob ops maintain independent contexts
 @s = ();
-if ($^O eq 'MacOS') {
-    while (<:*:a*.t>) {
-	my $i = 0;
-	print "# $_ <";
-	push @s, $_;
-	while (<:*:b*.t>) {
-	    print " $_";
-	    $i++;
-	}
-	print " >\n";
-    }
-} else {
-    while (<*/a*.t>) {
-	my $i = 0;
-	print "# $_ <";
-	push @s, $_;
-	while (<*/b*.t>) {
-	    print " $_";
-	    $i++;
-	}
-	print " >\n";
+while (<*/a*.t>) {
+    my $i = 0;
+    print "# $_ <";
+    push @s, $_;
+    while (<*/b*.t>) {
+	print " $_";
+	$i++;
     }
+    print " >\n";
 }
 print "not " if "@r" ne "@s";
 print "ok 9\n";
@@ -136,28 +101,15 @@ eval <<'EOT';
 use File::DosGlob 'GLOBAL_glob';
 package Bar;
 @s = ();
-if ($^O eq 'MacOS') {
-    while (<:*:a*.t>) {
-	my $i = 0;
-	print "# $_ <";
-	push @s, $_;
-	while (glob ':*:b*.t') {
-	    print " $_";
-	    $i++;
-	}
-	print " >\n";
-    }
-} else {
-    while (<*/a*.t>) {
-	my $i = 0;
-	print "# $_ <";
-	push @s, $_;
-	while (glob '*/b*.t') {
-	    print " $_";
-	    $i++;
-	}
-	print " >\n";
+while (<*/a*.t>) {
+    my $i = 0;
+    print "# $_ <";
+    push @s, $_;
+    while (glob '*/b*.t') {
+	print " $_";
+	$i++;
     }
+    print " >\n";
 }
 print "not " if "@r" ne "@s";
 print "ok 10\n";