Skip to content

Commit

Permalink
Move all module code to segregated namespace under packages/
Browse files Browse the repository at this point in the history
Move all module code that will be loaded under packages/ -- while
also structuring their filesystem layout as distributions. This
should make it easier to keep track of what namespaces a given
`use lib ...` is bringing in.

For modules under packages/Test we not only create the distribution
file layout, but also add a META6.json. When using e.g. Test::Util
you load it via `packages/Test-Helpers`. This is slightly different
than all the other ad-hoc modules where you include via
`packages/Some-Name/lib` ( note the /lib ). This means we are testing
areas of the CUR system that were not tested at all before.
  • Loading branch information
ugexe committed Nov 4, 2018
1 parent aa32d4d commit 3e9291f
Show file tree
Hide file tree
Showing 428 changed files with 446 additions and 405 deletions.
2 changes: 1 addition & 1 deletion APPENDICES/A01-limits/misc.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(3).add: 'packages';
use Test;
use lib $?FILE.IO.parent(3).add: 'packages/Test-Helpers';
use Test::Util;

plan 3;
Expand Down
2 changes: 1 addition & 1 deletion APPENDICES/A01-limits/overflow.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(3).add("packages");
use lib $?FILE.IO.parent(3).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion APPENDICES/A02-some-day-maybe/misc.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(3).add: 'packages';
use Test;
use lib $?FILE.IO.parent(3).add: 'packages/Test-Helpers';
use Test::Util;

# The tests in this file ensure certain constructs die with a decent error
Expand Down
2 changes: 1 addition & 1 deletion APPENDICES/A03-older-specs/01-misc.t
@@ -1,6 +1,6 @@
use v6.c;
use lib $?FILE.IO.parent(3).add: 'packages';
use Test;
use lib $?FILE.IO.parent(3).add: 'packages/Test-Helpers';
use Test::Util;

plan 9;
Expand Down
2 changes: 1 addition & 1 deletion APPENDICES/A04-experimental/01-misc.t
@@ -1,6 +1,6 @@
use v6.c;
use lib $?FILE.IO.parent(3).add: 'packages';
use Test;
use lib $?FILE.IO.parent(3).add: 'packages/Test-Helpers';
use Test::Util;

plan 19;
Expand Down
2 changes: 1 addition & 1 deletion MISC/bug-coverage-6.d.t
@@ -1,5 +1,5 @@
use v6.d.PREVIEW;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion MISC/bug-coverage-stress-6.d.t
@@ -1,5 +1,5 @@
use v6.d.PREVIEW;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
4 changes: 3 additions & 1 deletion MISC/bug-coverage-stress.t
@@ -1,8 +1,10 @@
use v6.c;
use lib $?FILE.IO.parent(2).add("packages");
use Test;
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test::Util;

use lib $?FILE.IO.parent(2).add("packages/RAKUDO1413/lib");

# This file is for random bugs that don't really fit well in other places
# or ones that need to be only part of strestest and not spectest.
# Feel free to move the tests to more appropriate places.
Expand Down
2 changes: 1 addition & 1 deletion MISC/bug-coverage.t
@@ -1,6 +1,6 @@
use v6.c;
use lib $?FILE.IO.parent(2).add("packages");
use Test;
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test::Util;

# This file is for random bugs that don't really fit well in other places.
Expand Down
2 changes: 1 addition & 1 deletion MISC/misc-6.d.t
@@ -1,5 +1,5 @@
use v6.d.PREVIEW;
use lib $?FILE.IO.parent(2).add: 'packages';
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test;
use Test::Util;

Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -126,12 +126,12 @@ specify a different implementation and other options.
## Test Utilities

This repository contains
[`Test::Util` module](packages/Test/Util.pm) with helper routines
[`Test::Util` module](packages/Test-Helpers/lib/Test/Util.pm) with helper routines
you can use when writing tests. See POD documentation included at the end of
the [module's source code](packages/Test/Util.pm). To include
the [module's source code](packagesTest-Helpers/lib/Test/Util.pm). To include
the module, in your test file, you need to add `use lib` line to your test file.

use lib $?FILE.IO.parent(2).add: 'packages';
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;
use Test;

Expand Down
2 changes: 1 addition & 1 deletion S01-perl-5-integration/eval_lex.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;
plan 2;
Expand Down
2 changes: 1 addition & 1 deletion S02-lists/indexing.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;
plan 4;
Expand Down
2 changes: 1 addition & 1 deletion S02-literals/allomorphic.t
@@ -1,7 +1,7 @@
# S02-literals/allomorphic.t --- Tests for the various allmorphic types, and val() processing

use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-literals/heredocs.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;
plan 33;
Expand Down
2 changes: 1 addition & 1 deletion S02-literals/pairs.t
@@ -1,6 +1,6 @@
use v6;

use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");

use Test;
use Test::Idempotence;
Expand Down
2 changes: 1 addition & 1 deletion S02-literals/quoting.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;
plan 212;
Expand Down
2 changes: 1 addition & 1 deletion S02-literals/radix.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-literals/string-interpolation.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");

use Test;
use Test::Util;
Expand Down
2 changes: 1 addition & 1 deletion S02-magicals/KERNEL.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-magicals/args.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");

use Test;

Expand Down
2 changes: 1 addition & 1 deletion S02-magicals/env.t
@@ -1,7 +1,7 @@
use v6;

# Tests for magic variables
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");

use Test;
use Test::Util;
Expand Down
2 changes: 1 addition & 1 deletion S02-magicals/pid.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");

use Test;
use Test::Util;
Expand Down
2 changes: 1 addition & 1 deletion S02-magicals/progname.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");

use Test;
use Test::Util;
Expand Down
2 changes: 1 addition & 1 deletion S02-one-pass-parsing/misc.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/array.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/bag-iterator.t
@@ -1,7 +1,7 @@
use v6;
use Test;

use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test::Iterator;

plan 2 * 7;
Expand Down
2 changes: 1 addition & 1 deletion S02-types/baghash.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

plan 304;
Expand Down
2 changes: 1 addition & 1 deletion S02-types/capture.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;
plan 44;
Expand Down
2 changes: 1 addition & 1 deletion S02-types/hash.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/infinity.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test;
use Test::Util;
plan 21;
Expand Down
4 changes: 1 addition & 3 deletions S02-types/int-uint.t
@@ -1,10 +1,8 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

use Test;

# L<S09/Sized types/Sized low-level types are named most generally by appending the number of bits to a generic low-level type name>

my @inttypes = <int uint> X~ <1 2 4 8 16 32 64>;
Expand Down
2 changes: 1 addition & 1 deletion S02-types/list.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/mix-iterator.t
@@ -1,7 +1,7 @@
use v6;
use Test;

use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test::Iterator;

plan 2 * 7;
Expand Down
2 changes: 1 addition & 1 deletion S02-types/mix.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test::Util;
use Test;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/mixhash.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test::Util;
use Test;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/mu.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/native.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

plan 92;
Expand Down
2 changes: 1 addition & 1 deletion S02-types/nil.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

# Nil may be a type now. Required?
Expand Down
2 changes: 1 addition & 1 deletion S02-types/range-iterator.t
@@ -1,7 +1,7 @@
use v6;
use Test;

use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test::Iterator;

plan 12 * 6;
Expand Down
2 changes: 1 addition & 1 deletion S02-types/set-iterator.t
@@ -1,7 +1,7 @@
use v6;
use Test;

use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test::Iterator;

plan 2 * 6;
Expand Down
2 changes: 1 addition & 1 deletion S02-types/set.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

plan 226;
Expand Down
4 changes: 2 additions & 2 deletions S02-types/sethash.t
@@ -1,7 +1,7 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test::Util;
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

plan 258;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/version.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S02-types/whatever.t
@@ -1,6 +1,6 @@
use v6;

use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");

use Test;
use Test::Util;
Expand Down
2 changes: 1 addition & 1 deletion S03-junctions/autothreading.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

plan 106;
Expand Down
2 changes: 1 addition & 1 deletion S03-junctions/misc.t
@@ -1,5 +1,5 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test;
use Test::Util;

Expand Down
2 changes: 1 addition & 1 deletion S03-metaops/cross.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

plan 81;
Expand Down
2 changes: 1 addition & 1 deletion S03-metaops/hyper.t
@@ -1,6 +1,6 @@
use v6;

use lib $?FILE.IO.parent(2).add("packages");
use lib $?FILE.IO.parent(2).add("packages/Test-Helpers");

use Test;
use Test::Util;
Expand Down
2 changes: 1 addition & 1 deletion S03-operators/arith.t
@@ -1,6 +1,6 @@
use v6;
use lib $?FILE.IO.parent(2).add: 'packages';
use Test;
use lib $?FILE.IO.parent(2).add: 'packages/Test-Helpers';
use Test::Util;

plan 158;
Expand Down

0 comments on commit 3e9291f

Please sign in to comment.