From 42be9579ab7a1ba51a32dc4821498ae14cf04cd9 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Tue, 12 Jul 2022 15:25:19 +0200
Subject: Move bootstrap tests to their own directory

---
 test/TARGETS                     |  7 +++----
 test/bootstrap/TARGETS           |  8 ++++++++
 test/bootstrap/test-bootstrap.sh | 28 ++++++++++++++++++++++++++++
 test/test-bootstrap.sh           | 28 ----------------------------
 4 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 test/bootstrap/TARGETS
 create mode 100644 test/bootstrap/test-bootstrap.sh
 delete mode 100644 test/test-bootstrap.sh

(limited to 'test')

diff --git a/test/TARGETS b/test/TARGETS
index 885bb26c..79ad3519 100644
--- a/test/TARGETS
+++ b/test/TARGETS
@@ -23,9 +23,8 @@
   , "target": ["TESTS"]
   }
 , "bootstrap-test":
-  { "type": ["@", "rules", "shell/test", "script"]
-  , "name": ["bootstrap-test"]
-  , "test": ["test-bootstrap.sh"]
-  , "deps": [["", "bootstrap-src"], ["@", "just-distfiles", "", "distdir"]]
+  { "type": "install"
+  , "tainted": ["test"]
+  , "deps": [["./", "bootstrap", "TESTS"]]
   }
 }
diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS
new file mode 100644
index 00000000..3873cbce
--- /dev/null
+++ b/test/bootstrap/TARGETS
@@ -0,0 +1,8 @@
+{ "bundled-test":
+  { "type": ["@", "rules", "shell/test", "script"]
+  , "name": ["bootstrap-test-bundled"]
+  , "test": ["test-bootstrap.sh"]
+  , "deps": [["", "bootstrap-src"], ["@", "just-distfiles", "", "distdir"]]
+  }
+, "TESTS": {"type": "install", "tainted": ["test"], "deps": ["bundled-test"]}
+}
diff --git a/test/bootstrap/test-bootstrap.sh b/test/bootstrap/test-bootstrap.sh
new file mode 100644
index 00000000..e6b851fa
--- /dev/null
+++ b/test/bootstrap/test-bootstrap.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -eu
+
+export PATH=/bin:/usr/bin:$PATH
+
+readonly OUTDIR=${TEST_TMPDIR}/out
+readonly LBRDIR=${TEST_TMPDIR}/local-build-root
+
+mkdir -p "${OUTDIR}"
+mkdir -p "${LBRDIR}"
+
+BOOTSTRAP_BIN=./bin/bootstrap.py
+
+echo
+echo Bootstrap
+echo
+python3 ${BOOTSTRAP_BIN} . "${OUTDIR}"/boot distdir
+export JUST=$(realpath "${OUTDIR}"/boot/out/bin/just)
+
+echo
+echo Testing if we reached the fixed point
+echo
+readonly CONF=$(./bin/just-mr.py setup -C etc/repos.json --distdir=distdir --local-build-root="${LBRDIR}" just)
+${JUST} install -C ${CONF} -o "${OUTDIR}"/final-out --local-build-root="${LBRDIR}"
+
+sha256sum "${OUTDIR}"/boot/out/bin/just "${OUTDIR}"/final-out/bin/just
+cmp "${OUTDIR}"/boot/out/bin/just "${OUTDIR}"/final-out/bin/just
diff --git a/test/test-bootstrap.sh b/test/test-bootstrap.sh
deleted file mode 100644
index e6b851fa..00000000
--- a/test/test-bootstrap.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-export PATH=/bin:/usr/bin:$PATH
-
-readonly OUTDIR=${TEST_TMPDIR}/out
-readonly LBRDIR=${TEST_TMPDIR}/local-build-root
-
-mkdir -p "${OUTDIR}"
-mkdir -p "${LBRDIR}"
-
-BOOTSTRAP_BIN=./bin/bootstrap.py
-
-echo
-echo Bootstrap
-echo
-python3 ${BOOTSTRAP_BIN} . "${OUTDIR}"/boot distdir
-export JUST=$(realpath "${OUTDIR}"/boot/out/bin/just)
-
-echo
-echo Testing if we reached the fixed point
-echo
-readonly CONF=$(./bin/just-mr.py setup -C etc/repos.json --distdir=distdir --local-build-root="${LBRDIR}" just)
-${JUST} install -C ${CONF} -o "${OUTDIR}"/final-out --local-build-root="${LBRDIR}"
-
-sha256sum "${OUTDIR}"/boot/out/bin/just "${OUTDIR}"/final-out/bin/just
-cmp "${OUTDIR}"/boot/out/bin/just "${OUTDIR}"/final-out/bin/just
-- 
cgit v1.2.3