github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2024-12-26 21:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Convert %CONFIG_FLAGS to get_config()

Browse Source 
* tests/config-flags.pm.W32: Create a predefined Windows file.
* Makefile.am (test_FILES): Add it to the distribution.
* build_w32.bat: Install tests/config-flags.pm if not existing.
* tests/run_make_tests.pl (get_config): Create new function.
* tests/scripts/features/archives: Call get_config() rather than
using %CONFIG_FLAGS directly.
* tests/scripts/features/load: Ditto.
* tests/scripts/features/loadapi: Ditto.
* tests/scripts/functions/wildcard: Ditto.
This commit is contained in:
Paul Smith 2019-10-05 14:26:52 -04:00
parent bd7d03f8cd
commit 393d2a2d4a
8 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -94,6 +94,7 @@ m4_FILES = m4/gnulib-cache.m4
test_FILES = tests/run_make_tests tests/run_make_tests.bat \ test_FILES = tests/run_make_tests tests/run_make_tests.bat \
tests/run_make_tests.pl tests/test_driver.pl \ tests/run_make_tests.pl tests/test_driver.pl \
tests/config-flags.pm.in tests/config_flags_pm.com \ tests/config-flags.pm.in tests/config_flags_pm.com \
tests/config-flags.pm.W32 \
tests/mkshadow tests/jhelp.pl tests/guile.supp tests/README tests/mkshadow tests/jhelp.pl tests/guile.supp tests/README
# test/scripts are added via dist-hook below. # test/scripts are added via dist-hook below.

1
build_w32.bat
View File

@ -258,6 +258,7 @@ exit 1
:Success :Success
echo %OUTDIR% build succeeded. echo %OUTDIR% build succeeded.
if exist Basic.mk copy /Y Basic.mk Makefile if exist Basic.mk copy /Y Basic.mk Makefile
if not exist tests\config-flags.pm copy /Y tests\config-flags.pm.W32 tests\config-flags.pm
call :Reset call :Reset
goto :EOF goto :EOF

9
tests/config-flags.pm.W32 Normal file
View File

@ -0,0 +1,9 @@
# This is a -*-perl-*- script
#
# Set variables for Windows systems.
%CONFIG_FLAGS = (
USE_SYSTEM_GLOB => 'no'
);
1;

8
tests/run_make_tests.pl
View File

@ -483,10 +483,14 @@ sub find_prog
return ($v, $d, $f); return ($v, $d, $f);
} }
sub get_config
{
return exists($CONFIG_FLAGS{$_[0]}) ? $CONFIG_FLAGS{$_[0]} : '';
}
sub set_more_defaults sub set_more_defaults
{ {
local($string); my $string;
local($index);
# Now that we have located make_path, locate the srcdir and blddir # Now that we have located make_path, locate the srcdir and blddir
my ($mpv, $mpd, $mpf) = find_prog($make_path); my ($mpv, $mpd, $mpf) = find_prog($make_path);

7
tests/scripts/features/archives
View File

@ -29,11 +29,8 @@ if ($osname eq 'VMS') {
utouch(-60, qw(a1.o a2.o a3.o)); utouch(-60, qw(a1.o a2.o a3.o));
} }
my $ar = $CONFIG_FLAGS{AR}; # Fallback if configure did not find AR
my $ar = get_config('AR') || 'ar';
# Fallback if configure did not find AR, such as VMS
# which does not run configure.
$ar = 'ar' if $ar eq '';
my $redir = '2>&1'; my $redir = '2>&1';
$redir = '' if $osname eq 'VMS'; $redir = '' if $osname eq 'VMS';

9
tests/scripts/features/load
View File

@ -6,8 +6,8 @@ $details = "Test dynamic loading of modules.";
# Don't do anything if this system doesn't support "load" # Don't do anything if this system doesn't support "load"
exists $FEATURES{load} or return -1; exists $FEATURES{load} or return -1;
# CONFIG_FLAGS are loaded from config-flags.pm and set by configure my $cc = get_config('CC');
if (! exists $CONFIG_FLAGS{CC}) { if (! $cc) {
$verbose and print "Skipping load test: no CC defined\n"; $verbose and print "Skipping load test: no CC defined\n";
return -1; return -1;
} }
@ -46,7 +46,10 @@ close($F) or die "close: testload.c: $!\n";
# Make sure we can compile # Make sure we can compile
my $sobuild = "$CONFIG_FLAGS{CC} ".($srcdir? "-I$srcdir/src":'')." $CONFIG_FLAGS{CPPFLAGS} $CONFIG_FLAGS{CFLAGS} -shared -fPIC $CONFIG_FLAGS{LDFLAGS} -o testload.so testload.c"; my $cflags = get_config('CFLAGS');
my $cppflags = get_config('CPPFLAGS');
my $ldflags = get_config('LDFLAGS');
my $sobuild = "$cc ".($srcdir? "-I$srcdir/src":'')." $cppflags $cflags -shared -fPIC $ldflags -o testload.so testload.c";
my $clog = `$sobuild 2>&1`; my $clog = `$sobuild 2>&1`;
if ($? != 0) { if ($? != 0) {

9
tests/scripts/features/loadapi
View File

@ -6,8 +6,8 @@ $details = "Verify the different aspects of the shared object API.";
# Don't do anything if this system doesn't support "load" # Don't do anything if this system doesn't support "load"
exists $FEATURES{load} or return -1; exists $FEATURES{load} or return -1;
# CONFIG_FLAGS are loaded from config-flags.pm and set by configure my $cc = get_config('CC');
if (! exists $CONFIG_FLAGS{CC}) { if (! $cc) {
$verbose and print "Skipping load test: no CC defined\n"; $verbose and print "Skipping load test: no CC defined\n";
return -1; return -1;
} }
@ -80,7 +80,10 @@ close($F) or die "close: testapi.c: $!\n";
# Make sure we can compile # Make sure we can compile
my $sobuild = "$CONFIG_FLAGS{CC} ".($srcdir? "-I$srcdir/src":'')." $CONFIG_FLAGS{CPPFLAGS} $CONFIG_FLAGS{CFLAGS} -shared -fPIC $CONFIG_FLAGS{LDFLAGS} -o testapi.so testapi.c"; my $cflags = get_config('CFLAGS');
my $cppflags = get_config('CPPFLAGS');
my $ldflags = get_config('LDFLAGS');
my $sobuild = "$cc ".($srcdir? "-I$srcdir/src":'')." $cppflags $cflags -shared -fPIC $ldflags -o testapi.so testapi.c";
my $clog = `$sobuild 2>&1`; my $clog = `$sobuild 2>&1`;
if ($? != 0) { if ($? != 0) {

2
tests/scripts/functions/wildcard
View File

@ -145,7 +145,7 @@ if ($port_type ne 'W32' && eval { symlink("",""); 1 }) {
# Test for dangling symlinks # Test for dangling symlinks
# This doesn't work with the built-in glob... needs to be updated! # This doesn't work with the built-in glob... needs to be updated!
if ($CONFIG_FLAGS{USE_SYSTEM_GLOB} eq 'yes') { if (get_config('USE_SYSTEM_GLOB') eq 'yes') {
symlink($dir, $lnk); symlink($dir, $lnk);
run_make_test(qq!all: ; \@echo \$(wildcard $lnk)!, '', "$lnk"); run_make_test(qq!all: ; \@echo \$(wildcard $lnk)!, '', "$lnk");