From a046aef32a504ae960e1a7eb744355428d0afae3 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Thu, 06 Jul 2023 15:46:33 -0400
Subject: tests: Update to use executables in subdirectories

---
diff --git a/tests/build.sh b/tests/build.sh
index 01eafd1..123d9bc 100755
--- a/tests/build.sh
+++ b/tests/build.sh
@@ -31,7 +31,7 @@ fi
 
 mkdir -p "${TOP_BUILDDIR}/tests/pkg/data/dev/"
 OPK_WORK_AREA="${TOP_BUILDDIR}/tests/pkg/" command_ok_ 'mknod' -- \
-	"${TOP_BUILDDIR}/mknod${EXEEXT}" \
+	"${TOP_BUILDDIR}/helpers/mknod${EXEEXT}" \
 	"${TOP_BUILDDIR}/tests/pkg/data/dev/null" c 1 3
 
 cmd_is 'specials file' cat "${TOP_BUILDDIR}/tests/pkg/specials" 0<<-EOF
@@ -41,7 +41,7 @@ cmd_is 'specials file' cat "${TOP_BUILDDIR}/tests/pkg/specials" 0<<-EOF
 	EOF
 
 SOURCE_DATE_EPOCH=1685592000 command_ok_ 'package building' -- \
-	"${TOP_BUILDDIR}/opkg-opk" \
+	"${TOP_BUILDDIR}/opkg-opk/opkg-opk" \
 	-b \
 	-c "${TOP_SRCDIR}/tests/pkg/control/" \
 	-d "${TOP_BUILDDIR}/tests/pkg/data/" \
@@ -49,7 +49,7 @@ SOURCE_DATE_EPOCH=1685592000 command_ok_ 'package building' -- \
 	"${TOP_BUILDDIR}/tests/pkg.opk"
 
 cmd_is 'package info' \
-	"${TOP_BUILDDIR}/opkg-opk" \
+	"${TOP_BUILDDIR}/opkg-opk/opkg-opk" \
 	-f control \
 	-L \
 	"${TOP_BUILDDIR}/tests/pkg.opk" \
diff --git a/tests/version.sh b/tests/version.sh
index bec8038..a593a80 100755
--- a/tests/version.sh
+++ b/tests/version.sh
@@ -23,7 +23,7 @@ set -eu
 
 plan_ 1
 
-got="$("${TOP_BUILDDIR}/opkg-opk" -V)"
+got="$("${TOP_BUILDDIR}/opkg-opk/opkg-opk" -V)"
 case "${got}" in
 	'opkg-opk '*)
 		result_ 'ok' -- 'opkg-opk version output'
--
cgit v0.9.1