Somewhat working test running
This commit is contained in:
parent
49c118eef4
commit
9bd0cc323f
41
bin/iutils
41
bin/iutils
|
@ -2,7 +2,9 @@
|
||||||
use v6.d;
|
use v6.d;
|
||||||
use IUtils;
|
use IUtils;
|
||||||
use IUtils::Regexes;
|
use IUtils::Regexes;
|
||||||
|
use IUtils::Compiler;
|
||||||
|
|
||||||
|
# TODO: Add filtering for tests based on module/name
|
||||||
#| Execute the tests in an idris project
|
#| Execute the tests in an idris project
|
||||||
multi MAIN(
|
multi MAIN(
|
||||||
"test",
|
"test",
|
||||||
|
@ -12,13 +14,38 @@ multi MAIN(
|
||||||
chdir($project-path.IO.resolve: :completely) if $project-path;
|
chdir($project-path.IO.resolve: :completely) if $project-path;
|
||||||
# Scan for our packages
|
# Scan for our packages
|
||||||
my @packages = scan-packages;
|
my @packages = scan-packages;
|
||||||
# Collect tests
|
# Collect runables
|
||||||
my @tests;
|
my @runables = @packages.map: *.runnables;
|
||||||
for @packages -> $package {
|
# Run the tests
|
||||||
# FIXME
|
my $basedir = $*CWD;
|
||||||
say 'Finding tests for ', $package.ipkg.relative;
|
for @runables -> $runable {
|
||||||
for $package.sources -> $source {
|
# Make sure the package is built
|
||||||
say 'Scanning for tests in ', $source;
|
pack-build $runable.ipkg.relative;
|
||||||
|
# CD to the local directory to make sure idris can exec the expressions
|
||||||
|
indir $runable.ipkg.parent, {
|
||||||
|
next unless $runable.tests.elems > 0;
|
||||||
|
say "** Testing {$runable.ipkg.relative: $basedir}";
|
||||||
|
for $runable.tests.keys -> $module-name {
|
||||||
|
my $module = $runable.tests{$module-name};
|
||||||
|
next unless $module.tests.elems > 0;
|
||||||
|
say "-- Testing $module-name".indent(2);
|
||||||
|
for $module.tests -> $test {
|
||||||
|
try {
|
||||||
|
idris-exec $test, $module.source.relative;
|
||||||
|
}
|
||||||
|
if $! {
|
||||||
|
my $stdout = $1.err.lines.map(*.indent(8)).join("\n");
|
||||||
|
say "+ $test: FAIL".indent(4);
|
||||||
|
say "stdout:".indent(6);
|
||||||
|
$!.err.lines.map(*.indent(8)).join("\n");
|
||||||
|
say "stderr:".indent(6);
|
||||||
|
$!.err.lines.map(*.indent(8)).join("\n");
|
||||||
|
say "exit code: {$!.exit-code}"
|
||||||
|
} else {
|
||||||
|
say "+ $test: Pass".indent(4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,29 @@ unit module IUtils;
|
||||||
|
|
||||||
need IUtils::IDEMode;
|
need IUtils::IDEMode;
|
||||||
|
|
||||||
|
use IUtils::Regexes;
|
||||||
|
|
||||||
use paths;
|
use paths;
|
||||||
|
|
||||||
|
#| Structure representing the tests in a module
|
||||||
|
class ModuleTests {
|
||||||
|
#| The name of this module
|
||||||
|
has Str:D $.name is required;
|
||||||
|
#| The source file of this module
|
||||||
|
has IO::Path:D $.source is required;
|
||||||
|
#| A list of the associated tests this module has
|
||||||
|
has Str:D @.tests is required;
|
||||||
|
}
|
||||||
|
|
||||||
|
#| Structure representing all of the runables assocated with a project
|
||||||
|
class PackageRunables {
|
||||||
|
#| The ipkg for this project
|
||||||
|
has IO::Path:D $.ipkg is required;
|
||||||
|
# TODO: Add benchmarks
|
||||||
|
#| A map from the name of the module to a list of tests
|
||||||
|
has ModuleTests:D %.tests is required;
|
||||||
|
}
|
||||||
|
|
||||||
#| Structure representing the root of what idris considers a package directory,
|
#| Structure representing the root of what idris considers a package directory,
|
||||||
#| with the associated ipkg and source files. These can and will overlap within
|
#| with the associated ipkg and source files. These can and will overlap within
|
||||||
#| the same directory.
|
#| the same directory.
|
||||||
|
@ -12,6 +33,29 @@ class PackageInfo {
|
||||||
has IO::Path:D $.ipkg is required;
|
has IO::Path:D $.ipkg is required;
|
||||||
has IO::Path:D $.root is required;
|
has IO::Path:D $.root is required;
|
||||||
has IO::Path:D @.sources is required;
|
has IO::Path:D @.sources is required;
|
||||||
|
|
||||||
|
method runnables {
|
||||||
|
# Locate the tests
|
||||||
|
my %tests = Hash.new;
|
||||||
|
for @.sources -> $source {
|
||||||
|
my $contents = $source.slurp;
|
||||||
|
if $contents ~~ &module-name {
|
||||||
|
my $module-name = $<name>.Str;
|
||||||
|
my @tests;
|
||||||
|
for $contents.match(&flagged-expression, :g) -> $match {
|
||||||
|
@tests.push($match<test-name>.Str);
|
||||||
|
}
|
||||||
|
if @tests.elems > 0 {
|
||||||
|
%tests{$module-name} =
|
||||||
|
ModuleTests.new(name => $module-name,
|
||||||
|
source => $source,
|
||||||
|
tests => @tests);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
# Build and return the runnables
|
||||||
|
PackageRunables.new(ipkg => self.ipkg, tests => %tests)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#| Scan a particular ipkg for its associated sources
|
#| Scan a particular ipkg for its associated sources
|
||||||
|
|
|
@ -12,3 +12,7 @@ my regex flagged-expression is export {
|
||||||
[<&comment-start> \V* \v]*
|
[<&comment-start> \V* \v]*
|
||||||
<expression-name=&name> \h+ \: \V* \v
|
<expression-name=&name> \h+ \: \V* \v
|
||||||
}
|
}
|
||||||
|
|
||||||
|
my regex module-name is export {
|
||||||
|
'module' \h* $<name>=(\S+)
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue