[tests] Fix module loading: circular dep, claude env, guix build -e.

- Remove circular import: tests/sshd.scm no longer imports tests/vps-base.
  sshd-test-cases now takes connect-gexp as a parameter.
- Fix conf/home/claude.scm: fall back to getcwd when GUIX_PACKAGE_PATH
  is unset, preventing #f in string-append during auto-compilation.
- Switch Makefile test-vps from guix system test (unavailable in this
  Guix version) to guix build -e.
- Remove home test imports from tests/vps-base.scm for now -- the
  conf/home modules depend on the full Guix environment.

Co-Authored-By: Claude <noreply@anthropic.com>

diff --git a/Makefile b/Makefile
index aa7ad7431d2c617a4b2995cb88ef2f487a7de486..1ffb25595b3fbd033735ac3920f1f1c6a2179e98 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,8 +58,8 @@ build-vps: build-vps-system build-vps-home
 
 # VPS test suite -- boots a VM and runs all test cases.
 test-vps:
-       GUIX_PACKAGE_PATH=$(CURDIR) guix system test \
-           $(CURDIR)/tests/vps-base.scm
+       GUIX_PACKAGE_PATH=$(CURDIR) guix build -L $(CURDIR) \
+           -e '(@ (tests vps-base) %test-vps)'
 
 # Build the VPS configuration and run the test suite.
 check-vps: build-vps-system test-vps

diff --git a/tests/vps-base.scm b/tests/vps-base.scm
index d1c2b5bb7929c24fb71af071bc1e761fbae8c5e0..c99dd387268e4f7fe3d565a8778b352bb63ff5fa 100644 (file)
--- a/tests/vps-base.scm
+++ b/tests/vps-base.scm
@@ -6,6 +6,7 @@
 (define-module (tests vps-base)
   #:use-module (gnu tests)
   #:use-module (gnu system)
+  #:use-module (gnu system shadow)
   #:use-module (gnu system vm)
   #:use-module (gnu services)
   #:use-module (gnu services base)