From e200253f968e720c9f64650cb0e36b1378632163 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Thu, 26 Dec 2024 14:53:06 -0600 Subject: [PATCH] update tests given now-caught errors that were previously uncaught --- tests/idris2/misc/import006/expected | 2 +- tests/idris2/misc/import006/run | 2 +- tests/idris2/pkg/pkg003/expected | 2 +- tests/idris2/pkg/pkg003/run | 14 +++++++------- tests/idris2/pkg/pkg006/expected | 4 ++-- tests/idris2/pkg/pkg006/run | 10 +++++----- tests/idris2/pkg/pkg015/expected | 2 +- tests/idris2/pkg/pkg015/run | 2 +- tests/idris2/pkg/pkg018/expected | 6 ++---- tests/idris2/pkg/pkg018/run | 4 ++-- 10 files changed, 23 insertions(+), 25 deletions(-) diff --git a/tests/idris2/misc/import006/expected b/tests/idris2/misc/import006/expected index 507b6c8c9c..3942cb3685 100644 --- a/tests/idris2/misc/import006/expected +++ b/tests/idris2/misc/import006/expected @@ -1 +1 @@ -Uncaught error: Module imports form a cycle: A.B -> A.B +Error: Module imports form a cycle: A.B -> A.B diff --git a/tests/idris2/misc/import006/run b/tests/idris2/misc/import006/run index e00127a91a..ee2ad9c2e7 100644 --- a/tests/idris2/misc/import006/run +++ b/tests/idris2/misc/import006/run @@ -1,3 +1,3 @@ . ../../../testutils.sh -idris2 --build cyclic.ipkg +idris2 --build cyclic.ipkg 2>&1 diff --git a/tests/idris2/pkg/pkg003/expected b/tests/idris2/pkg/pkg003/expected index 7a5dab985a..2aba71eb1b 100644 --- a/tests/idris2/pkg/pkg003/expected +++ b/tests/idris2/pkg/pkg003/expected @@ -17,4 +17,4 @@ Overridable options are: --output-dir Packages must have an '.ipkg' extension: "malformed-package-name". -Uncaught error: File error (non-existent-package.ipkg): File Not Found +Error: File error in non-existent-package.ipkg : File Not Found diff --git a/tests/idris2/pkg/pkg003/run b/tests/idris2/pkg/pkg003/run index 0acfc870c8..38b4741bd9 100755 --- a/tests/idris2/pkg/pkg003/run +++ b/tests/idris2/pkg/pkg003/run @@ -1,11 +1,11 @@ . ../../../testutils.sh -idris2 --build testpkg.ipkg +idris2 --build testpkg.ipkg 2>&1 rm -rf build/ -idris2 --build testpkg.ipkg --quiet -idris2 --build testpkg.ipkg --verbose -idris2 --build testpkg.ipkg --codegen gambit -idris2 --build testpkg.ipkg --ide-mode -idris2 --build malformed-package-name -idris2 --build non-existent-package.ipkg +idris2 --build testpkg.ipkg --quiet 2>&1 +idris2 --build testpkg.ipkg --verbose 2>&1 +idris2 --build testpkg.ipkg --codegen gambit 2>&1 +idris2 --build testpkg.ipkg --ide-mode 2>&1 +idris2 --build malformed-package-name 2>&1 +idris2 --build non-existent-package.ipkg 2>&1 rm -rf build/ diff --git a/tests/idris2/pkg/pkg006/expected b/tests/idris2/pkg/pkg006/expected index e96b65d496..d17441ede9 100644 --- a/tests/idris2/pkg/pkg006/expected +++ b/tests/idris2/pkg/pkg006/expected @@ -1,7 +1,7 @@ -Uncaught error: EmptyFC:Failed to resolve the dependencies for test3: +Error: Failed to resolve the dependencies for test3: required foo >= 0.4 && < 0.5 but no matching version is installed -Uncaught error: EmptyFC:Failed to resolve the dependencies for test4: +Error: Failed to resolve the dependencies for test4: required baz any but no matching version is installed 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 3bf196037d..beaf656a1b 100755 --- a/tests/idris2/pkg/pkg006/run +++ b/tests/idris2/pkg/pkg006/run @@ -7,11 +7,11 @@ for folder in ./depends/*; do mkdir -p "${folder}/${TTC_VERSION}" done -idris2 --build test1.ipkg -idris2 --build test2.ipkg -idris2 --build test3.ipkg -idris2 --build test4.ipkg -idris2 --build test5.ipkg +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 for folder in ./depends/*; do rmdir "${folder}/${TTC_VERSION}" diff --git a/tests/idris2/pkg/pkg015/expected b/tests/idris2/pkg/pkg015/expected index 836f38eb59..568616f01a 100644 --- a/tests/idris2/pkg/pkg015/expected +++ b/tests/idris2/pkg/pkg015/expected @@ -1,4 +1,4 @@ -Uncaught error: EmptyFC:Failed to resolve the dependencies for test: +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 diff --git a/tests/idris2/pkg/pkg015/run b/tests/idris2/pkg/pkg015/run index 7bf2fc7728..8044398662 100644 --- a/tests/idris2/pkg/pkg015/run +++ b/tests/idris2/pkg/pkg015/run @@ -7,7 +7,7 @@ for folder in ./depends/*; do mkdir -p "${folder}/${TTC_VERSION}" done -idris2 --build test.ipkg --log package.depends:10 +idris2 --build test.ipkg --log package.depends:10 2>&1 for folder in ./depends/*; do rmdir "${folder}/${TTC_VERSION}" diff --git a/tests/idris2/pkg/pkg018/expected b/tests/idris2/pkg/pkg018/expected index d5bf1accb6..93fed1f163 100644 --- a/tests/idris2/pkg/pkg018/expected +++ b/tests/idris2/pkg/pkg018/expected @@ -1,14 +1,12 @@ -Uncaught error: Error: Unrecognised property "depend". +Error: Unrecognised property "depend". "bad.ipkg":2:1--2:7 1 | package bad 2 | depend = contrib ^^^^^^ - -Uncaught error: Error: Expected string. +Error: Expected string. "bad2.ipkg":2:13--2:16 1 | package bad 2 | sourcedir = src ^^^ - diff --git a/tests/idris2/pkg/pkg018/run b/tests/idris2/pkg/pkg018/run index 17ddd77d4a..88f04c842a 100644 --- a/tests/idris2/pkg/pkg018/run +++ b/tests/idris2/pkg/pkg018/run @@ -1,4 +1,4 @@ . ../../../testutils.sh -idris2 --build bad.ipkg -idris2 --build bad2.ipkg +idris2 --build bad.ipkg 2>&1 +idris2 --build bad2.ipkg 2>&1