From: Dmitry Volyntsev Date: Sat, 24 Oct 2026 05:22:14 +0000 (-0700) Subject: Tests: fix engine-specific nginx regression test skips X-Git-Url: https://git.kaiwu.me/http/%7B@url%7D?a=commitdiff_plain;h=93eb1ae84a9afd95fa64dac959592f740f9805da;p=njs.git Tests: fix engine-specific nginx regression test skips The engine-specific regression tests use try_run(), which reports any nginx startup failure as a skip. In js_clone_failure.t, the explicit js_engine njs directive also conflicts with an engine injected into the http block. The QuickJS lifetime tests already inherit the engine, but their probes can mistake a failed response for a compatible engine. Start the regression configuration once with run() and skip only when the probe returns a known, incompatible engine. Check both HTTP and stream for the wrapper GC test. Keep the clone-failure module out of the engine probe's location so its intentional exception does not interfere with the probe. --- diff --git a/nginx/t/js_clone_failure.t b/nginx/t/js_clone_failure.t index 26d6359a..79506eab 100644 --- a/nginx/t/js_clone_failure.t +++ b/nginx/t/js_clone_failure.t @@ -35,14 +35,17 @@ events { http { %%TEST_GLOBALS_HTTP%% - js_engine njs; - js_import test.js; - server { listen 127.0.0.1:8080; server_name localhost; + location = /engine { + js_import engine.js; + js_content engine.name; + } + location /failed { + js_import test.js; js_content test.content; js_body_filter test.filter; } @@ -55,6 +58,15 @@ http { EOF +$t->write_file('engine.js', <<'EOF'); + function name(r) { + r.return(200, njs.engine); + } + + export default { name }; + +EOF + $t->write_file('test.js', <<'EOF'); Promise.reject(new Error('unhandled')); throw new Error('clone failed'); @@ -71,7 +83,16 @@ $t->write_file('test.js', <<'EOF'); EOF -$t->try_run('no njs available')->plan(2); +$t->run(); + +my ($headers, $engine) = split(/\x0d\x0a\x0d\x0a/, http_get('/engine') // '', 2); +die "failed to determine js_engine\n" + unless defined $engine && $headers =~ /\AHTTP\/1\.[01] 200 / + && $engine =~ /\A(?:njs|QuickJS)\z/; + +plan(skip_all => 'context cloning requires the njs engine') + if $engine ne 'njs'; +$t->plan(2); ############################################################################### diff --git a/nginx/t/js_context_reuse_redirect.t b/nginx/t/js_context_reuse_redirect.t index 3c990656..66266c6f 100644 --- a/nginx/t/js_context_reuse_redirect.t +++ b/nginx/t/js_context_reuse_redirect.t @@ -46,8 +46,8 @@ http { location = /engine { js_context_reuse 0; - js_import test from engine.js; - js_content test.engine; + js_import engine.js; + js_content engine.name; } location = /source { @@ -65,11 +65,11 @@ http { EOF $t->write_file('engine.js', <<'EOF'); - function engine(r) { + function name(r) { r.return(200, njs.engine); } - export default {engine}; + export default { name }; EOF $t->write_file('source.js', <<'EOF'); @@ -102,9 +102,15 @@ $t->write_file('destination.js', <<'EOF'); EOF -$t->try_run('no njs available'); -plan(skip_all => 'QuickJS-specific context reuse tests') - if http_get('/engine') =~ /njs$/m; +$t->run(); + +my ($headers, $engine) = split(/\x0d\x0a\x0d\x0a/, http_get('/engine') // '', 2); +die "failed to determine js_engine\n" + unless defined $engine && $headers =~ /\AHTTP\/1\.[01] 200 / + && $engine =~ /\A(?:njs|QuickJS)\z/; + +plan(skip_all => 'context reuse requires the QuickJS engine') + if $engine ne 'QuickJS'; $t->plan(4); ############################################################################### diff --git a/nginx/t/js_fetch_headers_lifetime.t b/nginx/t/js_fetch_headers_lifetime.t index 951f10f5..06d68345 100644 --- a/nginx/t/js_fetch_headers_lifetime.t +++ b/nginx/t/js_fetch_headers_lifetime.t @@ -115,9 +115,15 @@ $t->write_file('test.js', <<'EOF'); EOF -$t->try_run('no njs available'); +$t->run(); + +my ($headers, $engine) = split(/\x0d\x0a\x0d\x0a/, http_get('/engine') // '', 2); +die "failed to determine js_engine\n" + unless defined $engine && $headers =~ /\AHTTP\/1\.[01] 200 / + && $engine =~ /\A(?:njs|QuickJS)\z/; + plan(skip_all => 'QuickJS-specific lifetime tests') - if http_get('/engine') =~ /njs$/m; + if $engine ne 'QuickJS'; $t->plan(9); ############################################################################### diff --git a/nginx/t/js_fetch_object_lifetime.t b/nginx/t/js_fetch_object_lifetime.t index 65d6e62e..b651187e 100644 --- a/nginx/t/js_fetch_object_lifetime.t +++ b/nginx/t/js_fetch_object_lifetime.t @@ -42,7 +42,7 @@ http { listen 127.0.0.1:8080; server_name localhost; - location /engine { + location = /engine { js_content test.engine; } @@ -141,9 +141,15 @@ $t->write_file('test.js', <try_run('no njs available'); -plan(skip_all => 'QuickJS-specific lifetime tests') - if http_get('/engine') =~ /njs$/m; +$t->run(); + +my ($headers, $engine) = split(/\x0d\x0a\x0d\x0a/, http_get('/engine') // '', 2); +die "failed to determine js_engine\n" + unless defined $engine && $headers =~ /\AHTTP\/1\.[01] 200 / + && $engine =~ /\A(?:njs|QuickJS)\z/; + +plan(skip_all => 'Fetch object finalization requires the QuickJS engine') + if $engine ne 'QuickJS'; $t->plan(11); ############################################################################### diff --git a/nginx/t/js_fetch_ownership.t b/nginx/t/js_fetch_ownership.t index f401ade5..97d20507 100644 --- a/nginx/t/js_fetch_ownership.t +++ b/nginx/t/js_fetch_ownership.t @@ -261,9 +261,15 @@ my @cases = ( ['/retain?op=release', qr/ok$/, 'release retained object'], ); -$t->try_run('no njs available'); +$t->run(); + +my ($headers, $engine) = split(/\x0d\x0a\x0d\x0a/, http_get('/engine') // '', 2); +die "failed to determine js_engine\n" + unless defined $engine && $headers =~ /\AHTTP\/1\.[01] 200 / + && $engine =~ /\A(?:njs|QuickJS)\z/; + plan(skip_all => 'QuickJS-specific lifetime tests') - if http_get('/engine') =~ /njs$/m; + if $engine ne 'QuickJS'; $t->plan(scalar @cases); ############################################################################### diff --git a/nginx/t/js_http_lifetime_scopes.t b/nginx/t/js_http_lifetime_scopes.t index 71d523cd..4e10adb3 100644 --- a/nginx/t/js_http_lifetime_scopes.t +++ b/nginx/t/js_http_lifetime_scopes.t @@ -174,10 +174,15 @@ $t->write_file('test.js', <<'EOF'); export default {engine, periodic, forced, results}; EOF -$t->try_run('no njs available'); +$t->run(); + +my ($headers, $engine) = split(/\x0d\x0a\x0d\x0a/, http_get('/engine') // '', 2); +die "failed to determine js_engine\n" + unless defined $engine && $headers =~ /\AHTTP\/1\.[01] 200 / + && $engine =~ /\A(?:njs|QuickJS)\z/; plan(skip_all => 'QuickJS-specific lifetime tests') - if http_get('/engine') =~ /njs$/m; + if $engine ne 'QuickJS'; $t->plan(3); diff --git a/nginx/t/js_http_object_lifetime.t b/nginx/t/js_http_object_lifetime.t index 97dba293..d53efe53 100644 --- a/nginx/t/js_http_object_lifetime.t +++ b/nginx/t/js_http_object_lifetime.t @@ -194,10 +194,15 @@ my @cases = qw/ @cases = grep { $_ eq $ENV{NJS_LIFETIME_CASE} } @cases if defined $ENV{NJS_LIFETIME_CASE}; -$t->try_run('no njs available'); +$t->run(); + +my ($headers, $engine) = split(/\x0d\x0a\x0d\x0a/, http_get('/engine') // '', 2); +die "failed to determine js_engine\n" + unless defined $engine && $headers =~ /\AHTTP\/1\.[01] 200 / + && $engine =~ /\A(?:njs|QuickJS)\z/; plan(skip_all => 'QuickJS-specific lifetime tests') - if http_get('/engine') =~ /njs$/m; + if $engine ne 'QuickJS'; $t->plan(2 * @cases); diff --git a/nginx/t/js_qjs_gc_mark.t b/nginx/t/js_qjs_gc_mark.t index a97ef980..7b7d9db0 100644 --- a/nginx/t/js_qjs_gc_mark.t +++ b/nginx/t/js_qjs_gc_mark.t @@ -43,7 +43,7 @@ http { listen 127.0.0.1:8080; server_name localhost; - location /engine { + location = /engine { js_content test.engine; } @@ -124,14 +124,22 @@ $t->write_file('test.js', <<'EOF'); } export default {engine, engine_name, http_cycle, - request_body_cycle, response_body_cycle, - stream_cycle}; + request_body_cycle, response_body_cycle, stream_cycle}; EOF -$t->try_run('no njs available'); -plan(skip_all => 'QuickJS-specific GC tests') - if http_get('/engine') =~ /njs$/m - || stream('127.0.0.1:' . port(8082))->read() =~ /njs$/; +$t->run(); + +my ($headers, $engine) = split(/\x0d\x0a\x0d\x0a/, http_get('/engine') // '', 2); +die "failed to determine HTTP js_engine\n" + unless defined $engine && $headers =~ /\AHTTP\/1\.[01] 200 / + && $engine =~ /\A(?:njs|QuickJS)\z/; + +my $stream_engine = stream('127.0.0.1:' . port(8082))->read(); +die "failed to determine stream js_engine\n" + unless defined $stream_engine && $stream_engine =~ /\A(?:njs|QuickJS)\z/; + +plan(skip_all => 'wrapper GC marking requires QuickJS in HTTP and stream') + if $engine ne 'QuickJS' || $stream_engine ne 'QuickJS'; $t->plan(4); ############################################################################### diff --git a/nginx/t/stream_js_object_lifetime.t b/nginx/t/stream_js_object_lifetime.t index 5c69c34c..c8b7ea07 100644 --- a/nginx/t/stream_js_object_lifetime.t +++ b/nginx/t/stream_js_object_lifetime.t @@ -178,9 +178,14 @@ my @cases = qw/variables variables_set variables_define raw_variables my $periodic = !defined $ENV{NJS_LIFETIME_CASE} || $ENV{NJS_LIFETIME_CASE} eq 'periodic'; -$t->try_run('no stream njs available'); +$t->run(); + +my $engine = stream('127.0.0.1:' . port(8082))->read(); +die "failed to determine stream js_engine\n" + unless defined $engine && $engine =~ /\A(?:njs|QuickJS)\z/; + plan(skip_all => 'QuickJS-specific lifetime tests') - if stream('127.0.0.1:' . port(8082))->read() =~ /njs$/; + if $engine ne 'QuickJS'; $t->plan(2 * @cases + ($periodic ? 1 : 0)); ###############################################################################