From afc4906acaeb7191e4ec085d7be4ca5b036b821d Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Wed, 8 Mar 2006 20:15:08 +0000 Subject: Some test updates for Windows. Handle SHELL set on the command line properly for windows. --- tests/scripts/features/default_names | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) (limited to 'tests/scripts/features/default_names') diff --git a/tests/scripts/features/default_names b/tests/scripts/features/default_names index 501f1fc..e53127e 100644 --- a/tests/scripts/features/default_names +++ b/tests/scripts/features/default_names @@ -7,59 +7,35 @@ default makefiles in the correct order (GNUmakefile,makefile,Makefile)"; $makefile = "GNUmakefile"; open(MAKEFILE,"> $makefile"); - print MAKEFILE "FIRST: ; \@echo It chose GNUmakefile\n"; - close(MAKEFILE); # DOS/WIN32 platforms preserve case, but Makefile is the same file as makefile. # Just test what we can here (avoid Makefile versus makefile test). -# -if ($port_type eq 'UNIX') -{ + +if ($port_type eq 'UNIX') { # Create another makefile called "makefile" open(MAKEFILE,"> makefile"); - print MAKEFILE "SECOND: ; \@echo It chose makefile\n"; - close(MAKEFILE); } - # Create another makefile called "Makefile" open(MAKEFILE,"> Makefile"); - print MAKEFILE "THIRD: ; \@echo It chose Makefile\n"; - close(MAKEFILE); &run_make_with_options("","",&get_logfile); - -# Create the answer to what should be produced by this Makefile -$answer = "It chose GNUmakefile\n"; - -# COMPARE RESULTS - -&compare_output($answer,&get_logfile(1)) || &error("abort"); +&compare_output("It chose GNUmakefile\n",&get_logfile(1)); unlink $makefile; -# DOS/WIN32 platforms preserve case, but Makefile is the same file as makefile. -# Just test what we can here (avoid Makefile versus makefile test). -# -if ($port_type eq 'UNIX') -{ - $answer = "It chose makefile\n"; - +if ($port_type eq 'UNIX') { &run_make_with_options("","",&get_logfile); - - &compare_output($answer,&get_logfile(1)) || &error("abort"); + &compare_output("It chose makefile\n",&get_logfile(1)); unlink "makefile"; } -$answer = "It chose Makefile\n"; - &run_make_with_options("","",&get_logfile); - -&compare_output($answer,&get_logfile(1)) || &error("abort"); +&compare_output("It chose Makefile\n",&get_logfile(1)); unlink "Makefile"; -- cgit v1.2.3