runtests: replace `--ci` with `--buidinfo`, show OS/Perl version again

I figure OS/Perl version may be useful to see in local runs,
and also in CI runs where `--ci` was not set:
https://curl.se/dev/log.cgi?id=20250820041228-707387#prob1

Also, only show a message if the `diff` tool is missing.

Follow-up to 985f39c0ce78b546e832c250588c14023123edfb #18147
Closes #18329

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7e1337d9d3da1d18d217930ef9c55a5855cc28b7..242d0d32b45e8917445738d5309260108c673db1 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -150,7 +150,6 @@ This release includes the following bugfixes:
  o pytest: increase server KeepAliveTimeout [26]
  o pytest: relax error check on test_07_22 [16]
  o resolving: dns error tracing [196]
- o runtests: add `--ci` option, show `Env:` only when non-empty [134]
  o runtests: assume `Time::HiRes`, drop Perl Win32 dependency [163]
  o schannel: add an error message for client cert not found [165]
  o schannel: assume `CERT_CHAIN_REVOCATION_CHECK_CHAIN` [114]
@@ -386,7 +385,6 @@ References to bug reports and discussions on issues:
  [131] = https://curl.se/bug/?i=18187
  [132] = https://curl.se/bug/?i=18160
  [133] = https://curl.se/bug/?i=18201
- [134] = https://curl.se/bug/?i=18147
  [135] = https://curl.se/bug/?i=18143
  [136] = https://curl.se/bug/?i=18142
  [137] = https://curl.se/bug/?i=18141

diff --git a/docs/runtests.md b/docs/runtests.md
index 0742444c54a0ce852c6cbc834a4d00e96feaa6ba..4a7ddf5c0bdf2046b7eeb0f4f6186b020bcc3d9c 100644 (file)
--- a/docs/runtests.md
+++ b/docs/runtests.md
@@ -96,15 +96,15 @@ Provide a path to a curl binary to talk to APIs (currently only CI test APIs).
 
 Display test results in automake style output (`PASS/FAIL: [number] [name]`).
 
+## `--buildinfo`
+
+Dump `buildinfo.txt`.
+
 ## `-c \<curl\>`
 
 Provide a path to a custom curl binary to run the tests with. Default is the
 curl executable in the build tree.
 
-## `--ci`
-
-Show extra information useful in for CI runs.
-
 ## `-d`
 
 Enable protocol debug: have the servers display protocol output. If used in

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 0593b513ee51c6687e5c76ff9ff9f76088e8fd60..657d9fe09a44378749a3da4126b164f6657769e2 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -126,7 +126,7 @@ curl_add_runtests(test-am        "-a -am")
 curl_add_runtests(test-full      "-a -p -r")
 # ~flaky means that it ignores results of tests using the flaky keyword
 curl_add_runtests(test-nonflaky  "-a -p ~flaky ~timing-dependent")
-curl_add_runtests(test-ci        "-a -p ~flaky ~timing-dependent -r --retry=5 -j20 --ci")
+curl_add_runtests(test-ci        "-a -p ~flaky ~timing-dependent -r --retry=5 -j20 --buildinfo")
 curl_add_runtests(test-torture   "-a -t -j20")
 curl_add_runtests(test-event     "-a -e")
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3894355fe9fa33ed1d7af56f77542b73584b91a5..639da33809606bff6cb439b649825715c572160c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -129,7 +129,7 @@ TEST_E = -a -e
 TEST_NF = -a -p ~flaky ~timing-dependent
 
 # special CI target derived from nonflaky with CI-specific flags
-TEST_CI = $(TEST_NF) -r --retry=5 -j20 --ci
+TEST_CI = $(TEST_NF) -r --retry=5 -j20 --buildinfo
 
 PYTEST = pytest
 endif

diff --git a/tests/globalconfig.pm b/tests/globalconfig.pm
index 9fa436d8bb86aa63e1436e4e14e1b4c68f9f9772..6ea605a219c9f676395b474dba8b93df58ba3502 100644 (file)
--- a/tests/globalconfig.pm
+++ b/tests/globalconfig.pm
@@ -46,7 +46,7 @@ BEGIN {
         $TUNITDIR
         $SRVDIR
         $listonly
-        $ci
+        $buildinfo
         $LOCKDIR
         $LOGDIR
         $memanalyze
@@ -95,7 +95,7 @@ our $verbose;         # 1 to show verbose test output
 our $torture;         # 1 to enable torture testing
 our $proxy_address;   # external HTTP proxy address
 our $listonly;        # only list the tests
-our $ci;              # show extra info useful in CI runs
+our $buildinfo;       # dump buildinfo.txt
 our $run_duphandle;   # run curl with --test-duphandle to verify handle duplication
 our $run_event_based; # run curl with --test-event to test the event API
 our $automakestyle;   # use automake-like test status output format

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 9064d799c3a1b7a25cc299d6d364ca9106beb799..32af1b24d418e20a318a94dc2192fdd0d8a1737a 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -856,14 +856,6 @@ sub checksystemfeatures {
     chomp $hosttype;
     my $hostos=$^O;
 
-    my $havediff;
-    if(system("diff $TESTDIR/DISABLED $TESTDIR/DISABLED 2>$dev_null") == 0) {
-      $havediff = 'available';
-    }
-    else {
-      $havediff = 'missing';
-    }
-
     # display summary information about curl and the test host
     logmsg("********* System characteristics ******** \n",
            "* $curl\n",
@@ -872,14 +864,10 @@ sub checksystemfeatures {
            "* Features: $feat\n",
            "* Disabled: $dis\n",
            "* Host: $hostname\n",
-           "* System: $hosttype\n");
-    if($ci) {
-        logmsg("* OS: $hostos\n",
-               "* Perl: $^V ($^X)\n",
-               "* diff: $havediff\n");
-    }
-    logmsg("* Args: $args\n");
-
+           "* System: $hosttype\n",
+           "* OS: $hostos\n",
+           "* Perl: $^V ($^X)\n",
+           "* Args: $args\n");
     if($jobs) {
         # Only show if not the default for now
         logmsg "* Jobs: $jobs\n";
@@ -902,6 +890,9 @@ sub checksystemfeatures {
         logmsg "* Env: $env\n";
     }
     logmsg "* Seed: $randseed\n";
+    if(system("diff $TESTDIR/DISABLED $TESTDIR/DISABLED 2>$dev_null") != 0) {
+        logmsg "* diff: missing\n";
+    }
 }
 
 #######################################################################
@@ -2452,8 +2443,8 @@ while(@ARGV) {
         # lists the test case names only
         $listonly=1;
     }
-    elsif($ARGV[0] eq "--ci") {
-        $ci=1;
+    elsif($ARGV[0] eq "--buildinfo") {
+        $buildinfo=1;
     }
     elsif($ARGV[0] =~ /^-j(.*)/) {
         # parallel jobs
@@ -2508,8 +2499,8 @@ Usage: runtests.pl [options] [test selection(s)]
   -a       continue even if a test fails
   -ac path use this curl only to talk to APIs (currently only CI test APIs)
   -am      automake style output PASS/FAIL: [number] [name]
+  --buildinfo dump buildinfo.txt
   -c path  use this curl executable
-  --ci     show extra info useful in for CI runs (e.g. buildinfo.txt dump)
   -d       display server debug info
   -e, --test-event  event-based execution
   --test-duphandle  duplicate handles before use
@@ -2697,7 +2688,7 @@ if(!$listonly) {
 #######################################################################
 # Output information about the curl build
 #
-if(!$listonly && $ci) {
+if(!$listonly && $buildinfo) {
     if(open(my $fd, "<", "../buildinfo.txt")) {
         while(my $line = <$fd>) {
             chomp $line;