Skip to content

Commit fa5d7b5

Browse files
committed
integration/macos: Fix test entrypoint
1 parent 8675135 commit fa5d7b5

File tree

1 file changed

+25
-24
lines changed

1 file changed

+25
-24
lines changed

integration/macos/test.sh

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,6 @@ fi
99
if [ -n "${PKG_PLATFORM_VERSION}" ]; then
1010
dest="${dest}-${PKG_PLATFORM_VERSION}"
1111
fi
12-
if [ -n "${PKG_TEST_JOBS}" ]; then
13-
dash_j="--jobs=${PKG_TEST_JOBS}"
14-
else
15-
dash_j=""
16-
fi
17-
test_dir="${workdir}/share/tests"
18-
test_files="$test_dir"
19-
if [ -n "${PKG_TEST_FILES}" ]; then
20-
# ${PKG_TEST_FILES} is specificaly used outside the quote so that it
21-
# can contain a glob.
22-
test_files=$(cd "$test_dir" && realpath $PKG_TEST_FILES)
23-
fi
24-
test_select=""
25-
if [ -n "${PKG_TEST_SELECT}" ]; then
26-
for pattern in $PKG_TEST_SELECT; do
27-
test_select="$test_select --include=${pattern}"
28-
done
29-
fi
30-
test_exclude=""
31-
if [ -n "${PKG_TEST_EXCLUDE}" ]; then
32-
for pattern in $PKG_TEST_EXCLUDE; do
33-
test_exclude="$test_exclude --exclude=${pattern}"
34-
done
35-
fi
3612

3713
cliurl="https://packages.geldata.com/dist/${PKG_PLATFORM_VERSION}-apple-darwin"
3814

@@ -75,6 +51,31 @@ fi
7551

7652
export PATH="${workdir}/bin/:${PATH}"
7753

54+
if [ -n "${PKG_TEST_JOBS}" ]; then
55+
dash_j="--jobs=${PKG_TEST_JOBS}"
56+
else
57+
dash_j=""
58+
fi
59+
test_dir="${workdir}/share/tests"
60+
test_files="$test_dir"
61+
if [ -n "${PKG_TEST_FILES}" ]; then
62+
# ${PKG_TEST_FILES} is specificaly used outside the quote so that it
63+
# can contain a glob.
64+
test_files=$(cd "$test_dir" && realpath $PKG_TEST_FILES)
65+
fi
66+
test_select=""
67+
if [ -n "${PKG_TEST_SELECT}" ]; then
68+
for pattern in $PKG_TEST_SELECT; do
69+
test_select="$test_select --include=${pattern}"
70+
done
71+
fi
72+
test_exclude=""
73+
if [ -n "${PKG_TEST_EXCLUDE}" ]; then
74+
for pattern in $PKG_TEST_EXCLUDE; do
75+
test_exclude="$test_exclude --exclude=${pattern}"
76+
done
77+
fi
78+
7879
"${workdir}/bin/python3" \
7980
-m edb.tools --no-devmode test \
8081
${test_files} ${test_select} \

0 commit comments

Comments
 (0)