diff --git a/.gitignore b/.gitignore index ffb1fdc..63ff99a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ tests/testing_bak/ include/sql/*.h -core.sqlite +emgauwa-core.sqlite diff --git a/core.ini b/emgauwa-core.ini similarity index 100% rename from core.ini rename to emgauwa-core.ini diff --git a/tests/controller.testing.ini b/tests/emgauwa-controller-testing.ini similarity index 100% rename from tests/controller.testing.ini rename to tests/emgauwa-controller-testing.ini diff --git a/tests/core.testing.ini b/tests/emgauwa-core-testing.ini similarity index 100% rename from tests/core.testing.ini rename to tests/emgauwa-core-testing.ini diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 476b3ba..ac523f0 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -35,7 +35,7 @@ fi echo "Emgauwa controller: $($EMGAUWA_CONTROLLER_EXE --version)" -$EMGAUWA_CONTROLLER_EXE start -c $source_dir/controller.testing.ini >$working_dir/controller.log 2>&1 & +$EMGAUWA_CONTROLLER_EXE start -c $source_dir/emgauwa-controller-testing.ini >$working_dir/controller.log 2>&1 & controller_id=$! cd $working_dir @@ -43,14 +43,13 @@ cd $working_dir touch $working_dir/index.html cp $1 $working_dir/core -cp $source_dir/core.testing.ini $working_dir/core.ini echo "=== invalids start (must exit) ===" >$working_dir/core.log -$working_dir/core >>$working_dir/core.log 2>&1 -$working_dir/core INVALID_ACTION >>$working_dir/core.log 2>&1 +$working_dir/core -c $source_dir/emgauwa-core-testing-ini >>$working_dir/core.log 2>&1 +$working_dir/core -c $source_dir/emgauwa-core-testing-ini INVALID_ACTION >>$working_dir/core.log 2>&1 echo "=== valid start ===" >>$working_dir/core.log -valgrind_emgauwa $working_dir/core start >>$working_dir/core.log 2>&1 & +valgrind_emgauwa $working_dir/core -c $source_dir/emgauwa-core-testing.ini start >>$working_dir/core.log 2>&1 & core_id=$!