[autopkgtest] Further refactoring to properly run the autopkgtest.

debian/changelog

@@ -1,3 +1,9 @@
+snapd-extra-utils (1.0.6) UNRELEASED; urgency=medium
+
+  * [autopkgtest] Further refactoring to properly run the autopkgtest.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 25 Nov 2024 01:12:04 -0600
+
 snapd-extra-utils (1.0.5) plucky; urgency=medium
 
   * [autopkgtest] Convert the snapd-seed-glue autopkgtest to C++.

debian/rules

@@ -3,11 +3,12 @@ export DH_VERBOSE = 1
 export GO111MODULE = off
 export GOPATH=/usr/share/gocode
 export GOCACHE=$(CURDIR)/.gocache
+export NUM_CPUS = $(shell nproc)
 
 %:
 	dh $@
 
 override_dh_auto_build:
 	(cd snapd-seed-glue && go build -gcflags="all=-N -l" -ldflags="-compressdwarf=false" -o snapd-seed-glue)
-	(cd snapd-seed-glue/tests && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . && make -j2 && mv snapd_seed_glue_test ../../debian/tests/snapd-seed-glue)
-	(cd snapd-installation-monitor && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . && make -j2)
+	(cd snapd-seed-glue/tests && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . && make -j${NUM_CPUS})
+	(cd snapd-installation-monitor && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo . && make -j${NUM_CPUS})

debian/tests/control

@@ -1,3 +1,3 @@
-Tests: snapd-seed-glue
-Depends: snapd-seed-glue
-Restrictions: needs-internet
+Test-Command: snapd-seed-glue/tests/snapd_seed_glue_test
+Depends: snapd-seed-glue, tree
+Restrictions: needs-internet, build-needed

snapd-seed-glue/tests/cli-tests.cpp

@@ -48,7 +48,7 @@ void confirm_success() {
 }
 
 void run_snapd_seed_glue(const std::vector<std::string>& args) {
-    std::string cmd = "/usr/bin/snapd-seed-glue --verbose --seed hello_test";
+    std::string cmd = "snapd-seed-glue/snapd-seed-glue --verbose --seed hello_test";
     for (const auto& arg : args) {
         cmd += " " + arg;
     }