From ab4d9ab00c898ebd5d8ebedd3c81d38de9a8863e Mon Sep 17 00:00:00 2001
From: Thibault Charbonnier <thibaultcha@me.com>
Date: Thu, 13 Jun 2024 10:00:56 -0700
Subject: [PATCH] chore(util) apply a fix to Test::Nginx as a patch

The fix ensures that the `--- shutdown_error_log` check in the END block
is skipped when no error.log was produced.
---
 t/TestWasmX.pm    |  6 ++++--
 util/setup_dev.sh | 44 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/t/TestWasmX.pm b/t/TestWasmX.pm
index c2c3df560..e8dc2b646 100644
--- a/t/TestWasmX.pm
+++ b/t/TestWasmX.pm
@@ -251,8 +251,10 @@ add_block_preprocessor(sub {
     }
 
     if (defined $skip_n) {
-        $block->set_value("skip_eval", sprintf('%d: (%s)', $skip_n,
-                                               join " || ", @block_skip));
+        my $eval_str = sprintf('%d: (%s)', $skip_n,
+                               join " || ", @block_skip);
+        #warn $eval_str;
+        $block->set_value("skip_eval", $eval_str);
     }
 
     # --- timeout_expected: 1
diff --git a/util/setup_dev.sh b/util/setup_dev.sh
index 02f19fbc2..e5eed89e1 100755
--- a/util/setup_dev.sh
+++ b/util/setup_dev.sh
@@ -113,6 +113,40 @@ EOF
      worker_processes  $Workers;
     -daemon $DaemonEnabled;
      master_process $MasterProcessEnabled;
+EOF
+    patch --forward --ignore-whitespace lib/perl5/Test/Nginx/Util.pm <<'EOF'
+    @@ -484,6 +484,7 @@ sub master_process_enabled (@) {
+     }
+
+     our @EXPORT = qw(
+    +    gen_rand_port
+         use_http2
+         use_http3
+         env_to_nginx
+EOF
+    patch --forward --ignore-whitespace lib/perl5/Test/Nginx/Socket.pm <<'EOF'
+    @@ -1468,6 +1468,10 @@ sub check_shutdown_error_log ($$) {
+
+             my %found;
+             $lines ||= error_log_data();
+    +        if (!defined $lines) {
+    +            return;
+    +        }
+    +
+             # warn "error log data: ", join "\n", @$lines;
+             for my $line (@$lines) {
+                 for my $pat (@$pats) {
+    @@ -1505,6 +1509,10 @@ sub check_shutdown_error_log ($$) {
+         }
+
+         $lines ||= error_log_data();
+    +    if (!defined $lines) {
+    +        return;
+    +    }
+    +
+         #warn "error log data: ", join "\n", @$lines;
+         for my $line (@$lines) {
+             for my $pat (@$pats) {
 EOF
     patch --forward --ignore-whitespace lib/perl5/Test/Nginx/Socket.pm <<'EOF'
     @@ -813,6 +813,10 @@ again:
@@ -126,16 +160,6 @@ EOF
          check_error_log($block, $res, $dry_run, $repeated_req_idx, $need_array);
 
          if (!defined $block->ignore_response) {
-EOF
-    patch --forward --ignore-whitespace lib/perl5/Test/Nginx/Util.pm <<'EOF'
-    @@ -484,6 +484,7 @@ sub master_process_enabled (@) {
-     }
-
-     our @EXPORT = qw(
-    +    gen_rand_port
-         use_http2
-         use_http3
-         env_to_nginx
 EOF
     set -e
 popd