From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 2 Jun 2021 14:38:57 +0000 (+0200)
Subject: runtests: parse data/Makefile.inc instead of using make
X-Git-Tag: curl-7_78_0~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7177%2Fhead;p=thirdparty%2Fcurl.git

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
---

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 3588ebd9c0..2e10bd4d17 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -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)
diff --git a/tests/runtests.pl b/tests/runtests.pl
index c2d9289f31..696c11a727 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -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);
 }
 
 #######################################################################