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

Jump to bottom

[ test ] Fix package tests hygiene #3088

Merged
merged 2 commits into from
Oct 4, 2023
Merged

[ test ] Fix package tests hygiene #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c264103
[ test ] Set `IDRIS2_PREFIX` to a local dir when testing
buzden Oct 3, 2023
75ace4f
[ re #3066 ] Make the rest of tests to use the same form as the others
buzden Oct 3, 2023
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ idris2docs_venv
/ipkg/build

/tests/**/build
/tests/**/prefix
/tests/**/output*
/tests/**/*.so
/tests/**/*.dylib
Expand Down
7 changes: 4 additions & 3 deletions tests/idris2/basic/basic071/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
rm -rf build
$1 --no-color --console-width 0 --no-banner --check B.idr
. ../../../testutils.sh

check B.idr

# Set very close time for A and B TTC files
touch A.idr
Expand All @@ -13,4 +14,4 @@ sync build/ttc/*/B.tt*

echo "-- this should be the last line of output --"

$1 --no-color --console-width 0 --no-banner --check B.idr
check B.idr
6 changes: 3 additions & 3 deletions tests/idris2/basic/case001/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rm -rf build
. ../../../testutils.sh

$1 --no-color --console-width 0 --no-banner --codegen chez InlineCase.idr -o inline-case
grep "define InlineCase-product" build/exec/inline-case_app/inline-case.ss
idris2 --codegen chez InlineCase.idr -o inline-case
grep "define InlineCase-product" build/exec/inline-case_app/inline-case.ss
4 changes: 2 additions & 2 deletions tests/idris2/basic/case002/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rm -rf build
. ../../../testutils.sh

$1 --no-color --console-width 0 --no-banner --check WhereData.idr
check WhereData.idr
4 changes: 2 additions & 2 deletions tests/idris2/basic/literals001/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rm -rf build
. ../../../testutils.sh

$1 --no-color --console-width 0 --no-banner -c Test.idr
check Test.idr
4 changes: 2 additions & 2 deletions tests/idris2/literate/literate018/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rm -rf build
. ../../../testutils.sh

$1 --no-color --console-width 0 --no-banner --check Test.lidr.md
check Test.lidr.md
1 change: 0 additions & 1 deletion tests/idris2/pkg/pkg010/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
. ../../../testutils.sh

export IDRIS2_PACKAGE_PATH=$IDRIS2_PREFIX/$NAME_VERSION
export IDRIS2_PREFIX=$test_dir/currently/nonexistent/dir/

export IDRIS2_INC_CGS=
Expand Down
4 changes: 0 additions & 4 deletions tests/idris2/pkg/pkg016/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,3 @@ idris2 --install baz.ipkg > /dev/null
idris2 --build test.ipkg

build/exec/test

rm -r "${IDRIS2_PREFIX}"/idris2-*/foo-0
rm -r "${IDRIS2_PREFIX}"/idris2-*/bar-0
rm -r "${IDRIS2_PREFIX}"/idris2-*/baz-0
9 changes: 4 additions & 5 deletions tests/idris2/total/total021/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
rm -rf build

$1 --no-color --console-width 0 --no-banner --check Issue-3030.idr
$1 --no-color --console-width 0 --no-banner --check Issue-3030b.idr
$1 --no-color --console-width 0 --no-banner --check Issue-524.idr
. ../../../testutils.sh

check Issue-3030.idr
check Issue-3030b.idr
check Issue-524.idr
23 changes: 23 additions & 0 deletions tests/testutils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ idris2="$1"
# Delete build files between runs to prevent unexpected differences.
# As this is at the top-level, this is run when this script is imported.
rm -rf build
rm -rf prefix

idris2() {
$idris2 --no-banner --console-width 0 --no-color "$@"
Expand All @@ -32,8 +33,30 @@ sed_literal() {
# Folder containing the currently running test
if [ "$OS" = "windows" ]; then
test_dir="$(cygpath -m "$(pwd)")"
SEP=";"
else
test_dir="$(pwd)"
SEP=":"
fi

# Set variables for hygiene testing
if [ -z "$PREFIX_CHANGED" ] && [ -n "$IDRIS2_PREFIX" ]; then
OLD_PREFIX="$IDRIS2_PREFIX"
NEW_PREFIX="$test_dir/prefix"

OLD_PP="$OLD_PREFIX/$NAME_VERSION"
NEW_PP="$NEW_PREFIX/$NAME_VERSION"

# Set where to look to installed stuff
export IDRIS2_PACKAGE_PATH="$OLD_PP$SEP$NEW_PP"
export IDRIS2_LIBS="$OLD_PP/libs$SEP$NEW_PP/libs"
export IDRIS2_DATA="$OLD_PP/support$SEP$NEW_PP/support"

# Set where to install stuff
export IDRIS2_PREFIX="$NEW_PREFIX"

# Save from re-sourcing this file several times
export PREFIX_CHANGED=1
fi

# Remove test directory from output
Expand Down
Loading