Skip to content

Commit 515ef56

Browse files
committed
chore(tests) add --- backtraces block
When set it will add `backtraces on;` to wasm context in nginx.conf
1 parent 9ad9c05 commit 515ef56

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

src/wasm/wrt/ngx_wrt_wasmer.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ ngx_wasmer_init_conf(ngx_wavm_conf_t *conf, ngx_log_t *log)
7474
char *auto_compiler = NULL;
7575
wasm_config_t *config;
7676

77+
ngx_wasm_assert(conf->backtraces != NGX_CONF_UNSET);
78+
79+
if (conf->backtraces) {
80+
setenv("RUST_BACKTRACE", "FULL", 1);
81+
82+
} else {
83+
setenv("RUST_BACKTRACE", "0", 1);
84+
}
85+
7786
config = wasm_config_new();
7887
if (config == NULL) {
7988
goto error;

src/wasm/wrt/ngx_wrt_wasmtime.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,11 @@ ngx_wasmtime_init_conf(ngx_wavm_conf_t *conf, ngx_log_t *log)
135135

136136
if (conf->backtraces) {
137137
setenv("WASMTIME_BACKTRACE_DETAILS", "1", 1);
138+
setenv("RUST_BACKTRACE", "FULL", 1);
138139

139140
} else {
140141
setenv("WASMTIME_BACKTRACE_DETAILS", "0", 1);
142+
setenv("RUST_BACKTRACE", "0", 1);
141143
}
142144

143145
config = wasm_config_new();

t/TestWasm.pm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,8 @@ add_block_preprocessor(sub {
104104
$block->set_value("request", "GET /t");
105105
}
106106

107-
# --- env variables
108-
109107
my $main_config = $block->main_config || '';
110108

111-
$block->set_value("main_config",
112-
"env WASMTIME_BACKTRACE_DETAILS=1;\n"
113-
. $main_config);
114-
115109
# --- load_nginx_modules: ngx_http_echo_module
116110

117111
my @arr;
@@ -149,6 +143,7 @@ add_block_preprocessor(sub {
149143
# --- wasm_modules: on_phases
150144

151145
my $wasm_modules = $block->wasm_modules;
146+
my $backtraces = $block->backtraces;
152147
if (defined $wasm_modules) {
153148
@arr = split /\s+/, $wasm_modules;
154149
if (@arr) {
@@ -162,6 +157,11 @@ add_block_preprocessor(sub {
162157
" compiler " . $compiler . ";\n";
163158
}
164159

160+
if (defined $backtraces) {
161+
$wasm_config = $wasm_config .
162+
" backtraces on;\n";
163+
}
164+
165165
my $tls_skip_verify = $block->tls_skip_verify;
166166
my $tls_skip_host_check = $block->tls_skip_host_check;
167167
my $tls_trusted_certificate = $block->tls_trusted_certificate;

0 commit comments

Comments
 (0)