From 3bcf2642287b834530cc43da7afebc8c296b3945 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 18 Mar 2018 11:38:42 +0000
Subject: [PATCH] trying another location
---
tests/tests_jc2server.sh | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 9e6e3d7dd..bfebce3a3 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -11,7 +11,7 @@ travistest="1"
# Debugging
if [ -f ".dev-debug" ]; then
- exec 5>dev-debug.log
+ exec 5>"tests/dev-debug.log"
BASH_XTRACEFD="5"
set -x
fi
@@ -484,9 +484,11 @@ echo "Enable dev-debug"
echo ""
(command_dev_debug.sh)
fn_test_result_pass
-grep "functionfile=" dev-debug.log
+grep "functionfile=" "tests/dev-debug.log"
echo "################## LS -AL"
ls -al
+echo "################## pwd"
+pwd
echo "1.0 - start - no files"
echo "================================="
echo "Description:"
@@ -495,7 +497,7 @@ echo "Command: ./jc2server start"
echo ""
(command_start.sh)
fn_test_result_fail
-grep "functionfile=" dev-debug.log
+grep "functionfile=" "tests/dev-debug.log"
echo ""
echo "1.1 - getopt"
@@ -506,7 +508,7 @@ echo "Command: ./jc2server"
echo ""
(core_getopt.sh)
fn_test_result_pass
-grep "functionfile=" dev-debug.log
+grep "functionfile=" "tests/dev-debug.log"
echo ""
echo "1.2 - getopt with incorrect args"
@@ -518,7 +520,7 @@ echo ""
getopt="abc123"
(core_getopt.sh)
fn_test_result_fail
-grep "functionfile=" dev-debug.log
+grep "functionfile=" "tests/dev-debug.log"
echo ""
echo "2.0 - install"
@@ -528,7 +530,7 @@ echo "install ${gamename} server."
echo "Command: ./jc2server auto-install"
(fn_autoinstall)
fn_test_result_pass
-grep "functionfile=" dev-debug.log
+grep "functionfile=" "tests/dev-debug.log"
echo ""
echo "3.1 - start"
@@ -540,7 +542,7 @@ requiredstatus="OFFLINE"
fn_setstatus
(command_start.sh)
fn_test_result_pass
-grep "functionfile=" dev-debug.log
+grep "functionfile=" "tests/dev-debug.log"
echo ""
echo "3.2 - start - online"