From 94097103c8340bd6839868fd1afd4e01a751b4c7 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Mon, 13 Jan 2014 05:35:54 -0800 Subject: [PATCH] test: nginx: Adds missing environment variables. Added the following environment variables: - DATA_DIR - TEMP_DIR - UPLOAD_DIR These were needed by the testing framework, as the name explains. --- tests/run-regression-tests-nginx.pl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/run-regression-tests-nginx.pl b/tests/run-regression-tests-nginx.pl index 7b2604e3..ec7e6720 100755 --- a/tests/run-regression-tests-nginx.pl +++ b/tests/run-regression-tests-nginx.pl @@ -32,6 +32,10 @@ my $REG_DIR = "$SCRIPT_DIR/regression"; my $NGINX_DIR = "$REG_DIR/nginx"; my $NGINX_CONF_TEMP = "$REG_DIR/nginx/conf/nginx.conf.template"; my $NGINX = q(/usr/local/nginx/sbin/nginx); +my $SROOT_DIR = "$REG_DIR/server_root"; +my $TEMP_DIR = "$SROOT_DIR/tmp"; +my $DATA_DIR = "$SROOT_DIR/data"; +my $UPLOAD_DIR = "$SROOT_DIR/upload"; my $PASSED = 0; my $TOTAL = 0; @@ -120,9 +124,9 @@ dircopy("$REG_DIR/server_root/htdocs","$opt{P}/html") or die $!; SERVER_PORT => $opt{p}, SERVER_NAME => "localhost", # TEST_NGX_PREFIX => $NGINX_DIR, -# DATA_DIR => $DATA_DIR, -# TEMP_DIR => $TEMP_DIR, -# UPLOAD_DIR => $UPLOAD_DIR, + DATA_DIR => $DATA_DIR, + TEMP_DIR => $TEMP_DIR, + UPLOAD_DIR => $UPLOAD_DIR, CONF_DIR => $CONF_DIR, # MODULES_DIR => $MODULES_DIR, LOGS_DIR => $FILES_DIR,