github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-09-04 05:32:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some test updates for Windows.

Browse Source 
Handle SHELL set on the command line properly for windows.
This commit is contained in:
Paul Smith
2006-03-08 20:15:08 +00:00
parent 8af9389f87
commit afc4906aca
8 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/scripts/features/default_names
View File

@@ -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";

2
tests/scripts/features/targetvars
View File

@@ -272,7 +272,7 @@ $answer = "no build information\n";
# Test a merge of set_lists for files, where one list is much longer
# than the other. See Savannah bug #15757.
mkdir('t1');
mkdir('t1', 0777);
touch('t1/rules.mk');
run_make_test('