forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make --logLevel work again, add some test options

This commit is contained in:
WebFreak001 2023-05-19 23:13:12 +02:00 committed by Jan Jurzitza
parent 5975b9c535
commit dc1305364c
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dcd/server/main.d
View File

@ -26,7 +26,6 @@ import std.datetime.stopwatch : AutoStart, StopWatch;
import std.exception : enforce;
import std.experimental.allocator;
import std.experimental.allocator.mallocator;
import std.experimental.logger;
import std.file;
import std.getopt;
import std.path: buildPath;
@ -34,6 +33,11 @@ import std.process;
import std.socket;
import std.stdio;
static if (__VERSION__ >= 2_101)
import std.logger;
else
import std.experimental.logger;
import msgpack;
import dcd.common.dcd_version;
@ -72,7 +76,7 @@ int runServer(string[] args)
bool printVersion;
bool ignoreConfig;
string[] importPaths;
LogLevel level = globalLogLevel;
LogLevel level = LogLevel.info;
version(Windows)
{
bool useTCP = true;
@ -99,7 +103,10 @@ int runServer(string[] args)
return 1;
}
globalLogLevel = level;
static if (__VERSION__ >= 2_101)
(cast()sharedLog).logLevel = level;
else
globalLogLevel = level;
if (printVersion)
{

26
tests/run_tests.sh
View File

@ -7,6 +7,8 @@ IMPORTS=$(pwd)/imports
export IMPORTS
SOCKETMODES="unix tcp"
TIME_SERVER=0
REUSE_SERVER=0
EXTRA_ARGS=
EXTRA_TESTCASES=
# `--arguments` must come before test dirs!
@ -17,6 +19,9 @@ while (( "$#" )); do
elif [[ "$1" == "--unix-only" ]]; then
# only test unix domain sockets
SOCKETMODES="unix"
elif [[ "$1" == "--reuse-server" ]]; then
# reuse existing dcd-server (for example when debugging it)
REUSE_SERVER=1
elif [[ "$1" == "--time-server" ]]; then
# --time-server runs dcd-server through /usr/bin/time, for statistics
# implies `--unix-only` (since we only want a single mode to time)
@ -26,6 +31,9 @@ while (( "$#" )); do
elif [[ "$1" == "--extra" ]]; then
# also include tests in the "extra" directory that long to complete
EXTRA_TESTCASES="extra/*/"
elif [[ "$1" == "--verbose" ]]; then
# also include tests in the "extra" directory that long to complete
EXTRA_ARGS="--logLevel=trace"
elif [[ "$1" =~ ^-- ]]; then
echo "Unrecognized test argument: $1"
exit 1
@ -52,11 +60,13 @@ server_pid=""
function startServer()
{
if [[ "$TIME_SERVER" == "1" ]]; then
/usr/bin/time -v "$server" "$tcp" --ignoreConfig -I $IMPORTS 2>stderr.txt > stdout.txt &
if [[ "$REUSE_SERVER" == "1" ]]; then
echo "Not starting server, since user wants to reuse existing server"
elif [[ "$TIME_SERVER" == "1" ]]; then
/usr/bin/time -v "$server" "$tcp" --ignoreConfig $EXTRA_ARGS -I $IMPORTS 2>stderr.txt > stdout.txt &
server_pid=$!
else
"$server" "$tcp" --ignoreConfig -I $IMPORTS 2>stderr.txt > stdout.txt &
"$server" "$tcp" --ignoreConfig $EXTRA_ARGS -I $IMPORTS 2>stderr.txt > stdout.txt &
server_pid=$!
fi
sleep 1
@ -81,9 +91,13 @@ function waitShutdown()
}
# Make sure that the server is shut down
echo "Shutting down currently-running server..."
"$client" --shutdown 2>/dev/null > /dev/null
"$client" --shutdown --tcp 2>/dev/null > /dev/null
if [[ "$REUSE_SERVER" == "1" ]]; then
echo "Not shutting down existing server due to --reuse-server"
else
echo "Shutting down currently-running server..."
"$client" --shutdown 2>/dev/null > /dev/null
"$client" --shutdown --tcp 2>/dev/null > /dev/null
fi
for socket in $SOCKETMODES; do # supported: unix tcp
# allow some time for server to shutdown