diff options
| author | Paul Smith <psmith@gnu.org> | 2022-08-14 15:03:40 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2022-08-22 21:19:18 -0400 |
| commit | 62da1c45e51f90892dd785fbdd42aeff769defb6 (patch) | |
| tree | 22128f902eaa5733528334a38bdd17574225e1ad /tests | |
| parent | ab31f0b5941721ed2f5ea20c33388caad01bd657 (diff) | |
| download | make-git-62da1c45e51f90892dd785fbdd42aeff769defb6.tar.gz | |
Fix bootstrap.bat for bootstrapping on Windows
* README.git: Clarify that these methods are lightly tested.
* build_w32.bat: Don't support any config step: fail if not completed.
Move the config steps into bootstrap.bat. Don't print compile lines
by default and add a --verbose option to show them.
* bootstrap.bat: Ensure we have curl and sed before we do anything.
Pull the latest necessary files from gnulib. Create a convert.sed
script that can update the various template files, and update
Basic.mk, config.h.W32, and gmk-default.h.
* tests/run_make_tests.pl: Remove CRLF rather than using chop. If we
run perl in Git for Bash it seems to handle newlines differently.
* tests/scripts/features/temp_stdin: Remove the make copy and close
STDIN so we can delete the temp file on Windows.
* .gitignore: Ignore the convert.sed script.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run_make_tests.pl | 4 | ||||
| -rw-r--r-- | tests/scripts/features/temp_stdin | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl index a534176f..95c07db7 100644 --- a/tests/run_make_tests.pl +++ b/tests/run_make_tests.pl @@ -573,7 +573,7 @@ sub set_more_defaults create_file('make.mk', 'all:;$(info $(MAKE))'); my $mk = `$make_path -sf make.mk`; unlink('make.mk'); - chop $mk; + $mk =~ s/\r?\n$//; $mk or die "FATAL ERROR: Cannot determine the value of \$(MAKE)\n"; $make_path = $mk; } @@ -583,7 +583,7 @@ sub set_more_defaults create_file('shell.mk', 'all:;$(info $(SHELL))'); $sh_name = `$make_path -sf shell.mk`; unlink('shell.mk'); - chop $sh_name; + $sh_name =~ s/\r?\n$//; if (! $sh_name) { print "Cannot determine shell\n"; $is_posix_sh = 0; diff --git a/tests/scripts/features/temp_stdin b/tests/scripts/features/temp_stdin index 59925caf..af2de2f9 100644 --- a/tests/scripts/features/temp_stdin +++ b/tests/scripts/features/temp_stdin @@ -98,8 +98,10 @@ force: check_tempfile($tdir); @make_command = @make_orig; +unlink($makecopy); } +close(STDIN); unlink('input.mk', 'bye.mk'); # This tells the test driver that the perl test script executed properly. |