diff --git a/tests/idris2/pkg/pkg006/expected b/tests/idris2/pkg/pkg006/expected index d17441ede9..cc18e5e1af 100644 --- a/tests/idris2/pkg/pkg006/expected +++ b/tests/idris2/pkg/pkg006/expected @@ -1,7 +1,21 @@ Error: Failed to resolve the dependencies for test3: - required foo >= 0.4 && < 0.5 but no matching version is installed + Required foo >= 0.4 && < 0.5 but no matching version is installed. + +Searched for packages in: + [...]/tests/idris2/pkg/pkg006/depends + [...]/tests/idris2/pkg/pkg006/prefix/idris2-0.7.0 + [...]/build/env/idris2-0.7.0 + +For more details on what packages Idris2 can locate, run `idris2 --list-packages` Error: Failed to resolve the dependencies for test4: - required baz any but no matching version is installed + Required baz any but no matching version is installed. + +Searched for packages in: + [...]/tests/idris2/pkg/pkg006/depends + [...]/tests/idris2/pkg/pkg006/prefix/idris2-0.7.0 + [...]/build/env/idris2-0.7.0 + +For more details on what packages Idris2 can locate, run `idris2 --list-packages` Warning: Deprecation warning: version numbers must now be of the form x.y.z diff --git a/tests/idris2/pkg/pkg006/run b/tests/idris2/pkg/pkg006/run index beaf656a1b..bbc26aae71 100755 --- a/tests/idris2/pkg/pkg006/run +++ b/tests/idris2/pkg/pkg006/run @@ -7,11 +7,17 @@ for folder in ./depends/*; do mkdir -p "${folder}/${TTC_VERSION}" done -idris2 --build test1.ipkg 2>&1 -idris2 --build test2.ipkg 2>&1 -idris2 --build test3.ipkg 2>&1 -idris2 --build test4.ipkg 2>&1 -idris2 --build test5.ipkg 2>&1 +TEST_PREFIX="$(cd ../../../.. && pwd)" + +fix_path() { + sed "s#$TEST_PREFIX#[...]#g" | windows_path_tweaks +} + +idris2 --build test1.ipkg 2>&1 | fix_path +idris2 --build test2.ipkg 2>&1 | fix_path +idris2 --build test3.ipkg 2>&1 | fix_path +idris2 --build test4.ipkg 2>&1 | fix_path +idris2 --build test5.ipkg 2>&1 | fix_path for folder in ./depends/*; do rmdir "${folder}/${TTC_VERSION}" diff --git a/tests/idris2/pkg/pkg015/expected b/tests/idris2/pkg/pkg015/expected index 568616f01a..3a0f46bc75 100644 --- a/tests/idris2/pkg/pkg015/expected +++ b/tests/idris2/pkg/pkg015/expected @@ -1,6 +1,13 @@ Error: Failed to resolve the dependencies for test: - foo-0.2.0; baz-0.3.0; required quux any but no matching version is installed - foo-0.2.0; baz-0.2.0; bar-0.1.1; required baz < 0.2.0 but assigned version 0.2.0 which is out of bounds - foo-0.2.0; baz-0.2.0; bar-0.1.0; required prz > 0.1.0 but no matching version is installed - foo-0.1.0; required baz < 0.1.0 but no matching version is installed + Required quux any but no matching version is installed. Resolved transitive dependencies: foo-0.2.0; baz-0.3.0. + Required baz < 0.2.0 but only found version 0.2.0 which is out of bounds. Resolved transitive dependencies: foo-0.2.0; baz-0.2.0; bar-0.1.1. + Required prz > 0.1.0 but no matching version is installed. Resolved transitive dependencies: foo-0.2.0; baz-0.2.0; bar-0.1.0. + Required baz < 0.1.0 but no matching version is installed. Resolved transitive dependencies: foo-0.1.0. + +Searched for packages in: + [...]/tests/idris2/pkg/pkg015/depends + [...]/tests/idris2/pkg/pkg015/prefix/idris2-0.7.0 + [...]/build/env/idris2-0.7.0 + +For more details on what packages Idris2 can locate, run `idris2 --list-packages` diff --git a/tests/idris2/pkg/pkg015/run b/tests/idris2/pkg/pkg015/run index 8044398662..7e1eea2852 100644 --- a/tests/idris2/pkg/pkg015/run +++ b/tests/idris2/pkg/pkg015/run @@ -7,7 +7,13 @@ for folder in ./depends/*; do mkdir -p "${folder}/${TTC_VERSION}" done -idris2 --build test.ipkg --log package.depends:10 2>&1 +TEST_PREFIX="$(cd ../../../.. && pwd)" + +fix_path() { + windows_path_tweaks | sed "s#$TEST_PREFIX#[...]#g" +} + +idris2 --build test.ipkg --log package.depends:10 2>&1 | fix_path for folder in ./depends/*; do rmdir "${folder}/${TTC_VERSION}" diff --git a/tests/idris2/pkg/pkg020/run b/tests/idris2/pkg/pkg020/run index 3d917df4cd..cad7af7aa8 100755 --- a/tests/idris2/pkg/pkg020/run +++ b/tests/idris2/pkg/pkg020/run @@ -1,14 +1,10 @@ . ../../../testutils.sh -windows_tweaks() { - sed 's#C:.msys64##' | sed 's#\\#/#g' -} - # pretend Idris2 is installed at root for reproducible # installdirs: IDRIS2_PREFIX=/ idris2 --dump-installdir test.ipkg \ - | windows_tweaks + | windows_path_tweaks # by contrast, the location containing all installed packages: IDRIS2_PREFIX=/ idris2 --libdir \ - | windows_tweaks + | windows_path_tweaks diff --git a/tests/testutils.sh b/tests/testutils.sh index 91d1e867fd..6417479ed8 100755 --- a/tests/testutils.sh +++ b/tests/testutils.sh @@ -40,6 +40,10 @@ sed_literal() { printf '%s\n' "$1" | sed -e 's/[]\/$*.^[]/\\&/g' } +windows_path_tweaks() { + sed 's#C:.msys64##' | sed 's#\\#/#g' +} + # used below to normalise machine names # shellcheck disable=SC2016 _awk_clean_name='