github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-08-31 19:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SV 63552] Change directories before constructing include paths

Browse Source 
* src/makeint.h (reset_makeflags): New function to handle changing
MAKEFLAGS from within makefiles.  Remove decode_env_switches().
* src/variable.c (set_special_var): Call reset_makeflags() instead
of various internal methods.
* src/main.c (decode_env_switches): Only internal now so make static.
(decode_switches): Don't invoke construct_include_path() yet.
(reset_makeflags): Decode env switches and construct include paths.
(main): Construct include paths after we process -C options.
* tests/scripts/options/dash-C: Rewrite to use new test constructs.
Add a test using both -C and -I together.
Add a test for multiple -C options.
This commit is contained in:
Paul Smith
2022-12-24 09:26:24 -05:00
parent a581146562
commit 76d2e5d98d
4 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
tests/scripts/options/dash-C
View File

@@ -2,65 +2,51 @@
$description = "Test the -C option to GNU make.";
$details = "\
This test is similar to the clean test except that this test creates the file
to delete in the work directory instead of the current directory. Make is
called from another directory using the -C workdir option so that it can both
find the makefile and the file to delete in the work directory.";
use File::Spec;
$example = $workdir . $pathsep . "EXAMPLE";
# Pre-set $makefile to be in a subdirectory
$makefile = 'Makefile';
open(MAKEFILE,"> $makefile");
print MAKEFILE qq!
all: ; \@echo This makefile did not clean the dir ... good
clean: ; $CMD_rmfile EXAMPLE\$(ext)
!;
close(MAKEFILE);
my $_srcdir = 'src';
mkdir($_srcdir, 0775);
my $_incdir = 'inc';
mkdir($_incdir, 0775);
my $_mkpath = File::Spec->catfile($_srcdir, $makefile);
create_file($_mkpath, "include \$(file)\nall: ;\n");
# TEST #1
# -------
touch($example);
run_make_with_options("${testname}.mk", "-C $workdir clean", &get_logfile);
use Cwd;
chdir $workdir;
$wpath = cwd();
chdir $cwdpath;
if (-f $example) {
$test_passed = 0;
}
# Create the answer to what should be produced by this Makefile
$answer = "$make_name: Entering directory '$wpath'\n"
. "$CMD_rmfile EXAMPLE\n"
. "$make_name: Leaving directory '$wpath'\n";
compare_output($answer,&get_logfile(1));
run_make_test('', "-C $_srcdir --no-print-directory",
"#MAKE#: 'all' is up to date.");
# TEST #2
# -------
# Do it again with trailing "/"; this should work the same
$example .= "slash";
run_make_test(undef, "-C $_srcdir/ --no-print-directory",
"#MAKE#: 'all' is up to date.");
touch($example);
# Test stringing together multiple -C options
run_make_with_options("${testname}.mk", "-C $workdir/ clean ext=slash", &get_logfile);
run_make_test(undef, "-C $_incdir -C .. -C $_srcdir --no-print-directory",
"#MAKE#: 'all' is up to date.");
if (-f $example) {
$test_passed = 0;
}
# SV 63552 - Ensure -I is considered after -C
# Create the answer to what should be produced by this Makefile
$answer = "$make_name: Entering directory '$wpath'\n"
. "$CMD_rmfile EXAMPLEslash\n"
. "$make_name: Leaving directory '$wpath'\n";
my $_incfile = 'test';
my $_incpath = File::Spec->catfile($_incdir, $_incfile);
create_file($_incpath, '$(info included)');
&compare_output($answer,&get_logfile(1));
my $_incopt = File::Spec->catfile('..', $_incdir);
unlink($example);
run_make_test(undef, "-C src -I $_incopt --no-print-directory file=$_incfile",
"included\n#MAKE#: 'all' is up to date.");
unlink($_incpath);
rmdir($_incdir);
unlink($_mkpath);
rmdir($_srcdir);
1;