Skip to content

Commit 65fc77b

Browse files
committed
test(e2e): preserve runtime contracts in fake xlings
1 parent 679c7ab commit 65fc77b

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

tests/e2e/52_local_path_namespaced_index.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ trap "rm -rf $TMP" EXIT
99

1010
export MCPP_HOME="$TMP/mcpp-home"
1111
source "$(dirname "$0")/_inherit_toolchain.sh"
12+
SUBOS_INFO_SEED="$MCPP_HOME/registry/subos/default/.xlings.json"
13+
[[ -f "$SUBOS_INFO_SEED" ]] || {
14+
echo "FAIL: inherited toolchain has no default SubOS runtime contract"
15+
exit 1
16+
}
1217

1318
INDEX_DIR="$TMP/local-index"
1419
mkdir -p "$INDEX_DIR/pkgs/c"
@@ -113,7 +118,8 @@ set -e
113118
114119
if [[ "${1:-}" == "self" && "${2:-}" == "init" ]]; then
115120
mkdir -p "${XLINGS_HOME:?}/subos/default"
116-
printf '{}\n' > "$XLINGS_HOME/subos/default/.xlings.json"
121+
cp "${FAKE_XLINGS_SUBOS_INFO:?}" \
122+
"$XLINGS_HOME/subos/default/.xlings.json"
117123
exit 0
118124
fi
119125
@@ -222,6 +228,7 @@ UPDATE_LOG="$TMP/fake-xlings-update.log"
222228
if ! FAKE_XLINGS_LOG="$FAKE_LOG" \
223229
FAKE_XLINGS_DIRECT_LOG="$FAKE_DIRECT_LOG" \
224230
FAKE_XLINGS_UPDATE_LOG="$UPDATE_LOG" \
231+
FAKE_XLINGS_SUBOS_INFO="$SUBOS_INFO_SEED" \
225232
"$MCPP" build > fetch.log 2>&1; then
226233
echo "FAIL: clean local path dependency install failed"
227234
cat fetch.log

tests/e2e/58_preinstall_mcpp_deps_for_hooks.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ trap "rm -rf $TMP" EXIT
1010

1111
export MCPP_HOME="$TMP/mcpp-home"
1212
source "$(dirname "$0")/_inherit_toolchain.sh"
13+
SUBOS_INFO_SEED="$MCPP_HOME/registry/subos/default/.xlings.json"
14+
[[ -f "$SUBOS_INFO_SEED" ]] || {
15+
echo "FAIL: inherited toolchain has no default SubOS runtime contract"
16+
exit 1
17+
}
1318

1419
INDEX_DIR="$TMP/local-index"
1520
mkdir -p "$INDEX_DIR/pkgs/c"
@@ -84,7 +89,8 @@ set -e
8489
8590
if [[ "${1:-}" == "self" && "${2:-}" == "init" ]]; then
8691
mkdir -p "${XLINGS_HOME:?}/subos/default"
87-
printf '{}\n' > "$XLINGS_HOME/subos/default/.xlings.json"
92+
cp "${FAKE_XLINGS_SUBOS_INFO:?}" \
93+
"$XLINGS_HOME/subos/default/.xlings.json"
8894
exit 0
8995
fi
9096
@@ -198,6 +204,7 @@ EOF
198204

199205
if ! FAKE_XLINGS_LOG="$FAKE_LOG" \
200206
FAKE_XLINGS_DIRECT_LOG="$FAKE_DIRECT_LOG" \
207+
FAKE_XLINGS_SUBOS_INFO="$SUBOS_INFO_SEED" \
201208
"$MCPP" build > build.log 2>&1; then
202209
cat build.log
203210
exit 1

0 commit comments

Comments
 (0)