diff --git a/tests/scripts/functions/wildcard b/tests/scripts/functions/wildcard index c3210eff..f01f574a 100644 --- a/tests/scripts/functions/wildcard +++ b/tests/scripts/functions/wildcard @@ -75,18 +75,21 @@ run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!, '', "file=\n"); # TEST #7: verify that when the input pattern has a trailing slash wildcard # returns only directories. +# +# Currently this doesn't work with our embedded GLOB so disable it. # ------- -touch("hellof"); -mkdir("hellod", 0770); -mkdir("hellod/worldd", 0770); -touch("hellod/worldf"); -mkdir("hellod/worldd/kend1", 0770); -mkdir("hellod/worldd/kend2", 0770); -touch("hellod/worldd/kenf1"); -touch("hellod/worldd/kenf2"); +if (get_config('USE_SYSTEM_GLOB') eq 'yes') { + touch("hellof"); + mkdir("hellod", 0770); + mkdir("hellod/worldd", 0770); + touch("hellod/worldf"); + mkdir("hellod/worldd/kend1", 0770); + mkdir("hellod/worldd/kend2", 0770); + touch("hellod/worldd/kenf1"); + touch("hellod/worldd/kenf2"); -run_make_test(qq! + run_make_test(qq! print3: \t\@echo \$(wildcard hello*) \t\@echo \$(wildcard hello*/) @@ -102,56 +105,59 @@ print3: \t\@echo \$(wildcard hellod/*/ken?[12]) \t\@echo \$(wildcard hellod/*/ken?[12]/) !, '', - "hellod hellof\n" - ."hellod/\n" - ."hellod/worldd hellod/worldf\n" - ."hellod/worldd/\n" - ."hellod hellof hellod/worldd hellod/worldf\n" - ."hellod/ hellod/worldd/\n" - ."hellod/worldd hellod/worldf\n" - ."hellod/worldd/\n" - ."hellod/worldd hellod/worldf\n" - ."hellod/worldd/\n" - ."hellod/worldd/kend1/ hellod/worldd/kend2/\n" - ."hellod/worldd/kend1 hellod/worldd/kend2 " - ."hellod/worldd/kenf1 hellod/worldd/kenf2\n" - ."hellod/worldd/kend1/ hellod/worldd/kend2/\n"); + "hellod hellof\n" + ."hellod/\n" + ."hellod/worldd hellod/worldf\n" + ."hellod/worldd/\n" + ."hellod hellof hellod/worldd hellod/worldf\n" + ."hellod/ hellod/worldd/\n" + ."hellod/worldd hellod/worldf\n" + ."hellod/worldd/\n" + ."hellod/worldd hellod/worldf\n" + ."hellod/worldd/\n" + ."hellod/worldd/kend1/ hellod/worldd/kend2/\n" + ."hellod/worldd/kend1 hellod/worldd/kend2 " + ."hellod/worldd/kenf1 hellod/worldd/kenf2\n" + ."hellod/worldd/kend1/ hellod/worldd/kend2/\n"); -unlink('hellof', 'hellod/worldf', 'hellod/worldd/kenf1', 'hellod/worldd/kenf2'); -foreach $d ('hellod/worldd/kend1', 'hellod/worldd/kend2', 'hellod/worldd', 'hellod') { + unlink('hellof', 'hellod/worldf', 'hellod/worldd/kenf1', + 'hellod/worldd/kenf2'); + foreach $d ('hellod/worldd/kend1', 'hellod/worldd/kend2', 'hellod/worldd', + 'hellod') { rmdir($d); + } } if ($port_type ne 'W32') { - # Check wildcard on the root directory - run_make_test('print4: ; @echo $(wildcard /)', '', "/\n"); + # Check wildcard on the root directory + run_make_test('print4: ; @echo $(wildcard /)', '', "/\n"); } if ($port_type ne 'W32' && eval { symlink("",""); 1 }) { - # TEST #6: check for wildcards matching directories - # See SV 53465 + # TEST #6: check for wildcards matching directories + # See SV 53465 - my $dir = '__rdir'; - my $lnk = '__ldir'; - mkdir($dir, 0777); + my $dir = '__rdir'; + my $lnk = '__ldir'; + mkdir($dir, 0777); + symlink($dir, $lnk); + + run_make_test(qq!all: ; \@echo \$(wildcard $lnk*/.)!, '', "$lnk/."); + + unlink($lnk); + rmdir($dir); + + # Test for dangling symlinks + # This doesn't work with the built-in glob... needs to be updated! + + if (get_config('USE_SYSTEM_GLOB') eq 'yes') { symlink($dir, $lnk); - run_make_test(qq!all: ; \@echo \$(wildcard $lnk*/.)!, '', "$lnk/."); + run_make_test(qq!all: ; \@echo \$(wildcard $lnk)!, '', "$lnk"); unlink($lnk); - rmdir($dir); - - # Test for dangling symlinks - # This doesn't work with the built-in glob... needs to be updated! - - if (get_config('USE_SYSTEM_GLOB') eq 'yes') { - symlink($dir, $lnk); - - run_make_test(qq!all: ; \@echo \$(wildcard $lnk)!, '', "$lnk"); - - unlink($lnk); - } + } } 1;