moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

runtests: parse data/Makefile.inc instead of using make 

The warning about missing entries in that file then doesn't require that
the Makefile has been regenerated which was confusing.

The scan for the test num is a little more error prone than before
(since now it doesn't actually verify that it is legitimate Makefile
syntax), but I think it is good enough.

Closes #7177
This commit is contained in:
Daniel Stenberg 2021-06-02 16:38:57 +02:00
parent e4db6fb02c
commit 3c0f4622cd
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/data/Makefile.am
View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@ -45,6 +45,3 @@ filecheck:
RC=$$? ; \
rm -rf test-place ; \
exit $$RC
show:
@echo $(EXTRA_DIST)

13
tests/runtests.pl
View File

@ -578,12 +578,15 @@ sub checkcmd {
#
my $disttests;
sub get_disttests {
my $makeCmd = 'make';
if(-f "../CMakeCache.txt") {
$makeCmd = 'cmake --build ../.. --target';
open(D, "<$TESTDIR/Makefile.inc");
while(<D>) {
chomp $_;
if(($_ =~ /^#/) ||($_ !~ /test/)) {
next;
}
$disttests .= join("", $_);
}
my @dist = `cd data && $makeCmd show`;
$disttests = join("", @dist);
close(D);
}
#######################################################################