Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement of integration test for windows #2917

Merged
merged 2 commits into from
Jun 5, 2024
+111 −13
Merged

Enhancement of integration test for windows #2917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d290a9
Run unittest directories for Windows
shoo Apr 18, 2024
68293ef
Refactoring in response to review comments
shoo Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 111 additions & 13 deletions test/run-unittest.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@ import common;

int main(string[] args)
{
import std.algorithm : among, endsWith;
import std.file : dirEntries, DirEntry, exists, getcwd, readText, SpanMode;
import std.format : format;
import std.stdio : File, writeln;
import std.path : absolutePath, buildNormalizedPath, baseName, dirName;
import std.process : environment, spawnProcess, wait;
import std.algorithm, std.file, std.format, std.stdio, std.path, std.process, std.string;
alias ProcessConfig = std.process.Config;

//** if [ -z ${DUB:-} ]; then
//** die $LINENO 'Variable $DUB must be defined to run the tests.'
Expand Down Expand Up @@ -46,12 +42,15 @@ int main(string[] args)
//** DC_BIN=$(basename "$DC")
//** CURR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
//** FRONTEND="${FRONTEND:-}"
const dc_bin = baseName(dc);
const dc_bin = baseName(dc).stripExtension;
Geod24 marked this conversation as resolved.
Show resolved Hide resolved
const curr_dir = __FILE_FULL_PATH__.dirName();
const frontend = environment.get("FRONTEND", "");
const frontend = environment.get("FRONTEND", __VERSION__.format!"%04d");
Geod24 marked this conversation as resolved.
Show resolved Hide resolved

//** if [ "$#" -gt 0 ]; then FILTER=$1; else FILTER=".*"; fi
auto filter = (args.length > 1) ? args[1] : "*";
version (linux) auto os = "linux";
version (Windows) auto os = "windows";
version (OSX) auto os = "osx";

version (Posix)
{
Expand All @@ -62,31 +61,130 @@ int main(string[] args)
//** log "Running $script..."
//** DUB=$DUB DC=$DC CURR_DIR="$CURR_DIR" $script || logError "Script failure."
//** done
foreach(DirEntry script; dirEntries(curr_dir, (args.length > 1) ? args[1] : "*.sh", SpanMode.shallow))
foreach(DirEntry script; dirEntries(curr_dir, "*.sh", SpanMode.shallow))
{
if (!script.name.baseName.globMatch(filter)) continue;
if (!script.name.endsWith(".sh"))
continue;
if (baseName(script.name).among("run-unittest.sh", "common.sh")) continue;
const min_frontend = script.name ~ ".min_frontend";
if (exists(min_frontend) && frontend.length && frontend < min_frontend.readText) continue;
if (exists(min_frontend) && frontend.length && cmp(frontend, min_frontend.readText) < 0) continue;
log("Running " ~ script ~ "...");
if (spawnProcess(script.name, ["DUB":dub, "DC":dc, "CURR_DIR":curr_dir]).wait)
if (spawnShell(script.name, ["DUB":dub, "DC":dc, "CURR_DIR":curr_dir]).wait)
logError("Script failure.");
else
log(script.name.baseName, " status: Ok");
}
}

foreach (DirEntry script; dirEntries(curr_dir, (args.length > 1) ? args[1] : "*.script.d", SpanMode.shallow))
foreach (DirEntry script; dirEntries(curr_dir, "*.script.d", SpanMode.shallow))
{
if (!script.name.baseName.globMatch(filter)) continue;
if (!script.name.endsWith(".d"))
continue;
const min_frontend = script.name ~ ".min_frontend";
if (frontend.length && exists(min_frontend) && frontend < min_frontend.readText) continue;
if (frontend.length && exists(min_frontend) && cmp(frontend, min_frontend.readText) < 0) continue;
log("Running " ~ script ~ "...");
if (spawnProcess([dub, script.name], ["DUB":dub, "DC":dc, "CURR_DIR":curr_dir]).wait)
logError("Script failure.");
else
log(script.name, " status: Ok");
}

//for pack in $(ls -d $CURR_DIR/*/); do
foreach (DirEntry pack; dirEntries(curr_dir, SpanMode.shallow))
{
//if [[ ! "$pack" =~ $FILTER ]]; then continue; fi
if (!pack.name.baseName.globMatch(filter)) continue;
if (!pack.isDir || pack.name.baseName.startsWith(".")) continue;
if (!pack.name.buildPath("dub.json").exists && !pack.name.buildPath("dub.sdl").exists && !pack.name.buildPath("package.json").exists) continue;
//if [ -e $pack/.min_frontend ] && [ ! -z "$FRONTEND" -a "$FRONTEND" \< $(cat $pack/.min_frontend) ]; then continue; fi
if (pack.name.buildPath(".min_frontend").exists && cmp(frontend, pack.name.buildPath(".min_frontend").readText) < 0) continue;

//#First we build the packages
//if [ ! -e $pack/.no_build ] && [ ! -e $pack/.no_build_$DC_BIN ]; then # For sourceLibrary
bool build = (!pack.name.buildPath(".no_build").exists
&& !pack.name.buildPath(".no_build_" ~ dc_bin).exists
&& !pack.name.buildPath(".no_build_" ~ os).exists);
if (build)
{
//build=1
//if [ -e $pack/.fail_build ]; then
// log "Building $pack, expected failure..."
// $DUB build --force --root=$pack --compiler=$DC 2>/dev/null && logError "Error: Failure expected, but build passed."
//else
// log "Building $pack..."
// $DUB build --force --root=$pack --compiler=$DC || logError "Build failure."
//fi
//if [ -e $pack/.fail_build ]; then
if (pack.name.buildPath(".fail_build").exists)
{
log("Building " ~ pack.name.baseName ~ ", expected failure...");
if (spawnProcess([dub, "build", "--force", "--compiler", dc], ["DUB":dub, "DC":dc, "CURR_DIR":curr_dir], ProcessConfig.none, pack.name).wait)
log(pack.name.baseName, " status: Ok");
else
logError("Failure expected, but build passed.");
}
else
{
log("Building ", pack.name.baseName, "...");
if (spawnProcess([dub, "build", "--force", "--compiler", dc], ["DUB":dub, "DC":dc, "CURR_DIR":curr_dir], ProcessConfig.none, pack.name).wait)
logError("Script failure.");
else
log(pack.name.baseName, " status: Ok");
}
}
//else
// build=0
//fi

//# We run the ones that are supposed to be run
//if [ $build -eq 1 ] && [ ! -e $pack/.no_run ] && [ ! -e $pack/.no_run_$DC_BIN ]; then
// log "Running $pack..."
// $DUB run --force --root=$pack --compiler=$DC || logError "Run failure."
//fi
if (build
&& !pack.name.buildPath(".no_run").exists
&& !pack.name.buildPath(".no_run_" ~ dc_bin).exists
&& !pack.name.buildPath(".no_run_" ~ os).exists)
{
log("Running ", pack.name.baseName, "...");
if (spawnProcess([dub, "run", "--force", "--compiler", dc], ["DUB":dub, "DC":dc, "CURR_DIR":curr_dir], ProcessConfig.none, pack.name).wait)
logError("Run failure.");
else
log(pack.name.baseName, " status: Ok");
}

//# Finally, the unittest part
//if [ $build -eq 1 ] && [ ! -e $pack/.no_test ] && [ ! -e $pack/.no_test_$DC_BIN ]; then
// log "Testing $pack..."
// $DUB test --force --root=$pack --compiler=$DC || logError "Test failure."
//fi
if (build
&& !pack.name.buildPath(".no_test").exists
&& !pack.name.buildPath(".no_test_" ~ dc_bin).exists
&& !pack.name.buildPath(".no_test_" ~ os).exists)
{
log("Testing ", pack.name.baseName, "...");
if (spawnProcess([dub, "test", "--force", "--root", pack.name, "--compiler", dc], ["DUB":dub, "DC":dc, "CURR_DIR":curr_dir]).wait)
logError("Test failure.");
else
log(pack.name.baseName, " status: Ok");
}
//done
}

//echo
//echo 'Testing summary:'
//cat $(dirname "${BASH_SOURCE[0]}")/test.log
writeln();
writeln("Testing summary:");
auto logLines = readText("test.log").splitLines;
foreach (line; logLines)
writeln(line);
auto errCnt = logLines.count!(a => a.startsWith("[ERROR]"));
auto passCnt = logLines.count!(a => a.startsWith("[INFO]") && a.endsWith("status: Ok"));
writeln(passCnt , "/", errCnt + passCnt, " tests were successed.");

return any_errors;
}
Loading