From 582ee5b404dbc7e17a6b86ba8662718a8632ef9b Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Fri, 22 Sep 2023 16:06:14 -0400
Subject: [PATCH] Fix up tests plan and tests for legacy pool script

Signed-off-by: mulhern <amulhern@redhat.com>
---
 plans/all.fmf      | 17 ++++++++++++++++-
 test/loop/main.fmf |  2 +-
 test/udev/main.fmf |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/plans/all.fmf b/plans/all.fmf
index 679cf40f1e4..3638f1a94fa 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -3,14 +3,29 @@ prepare:
   - name: Install packages
     how: install
     package:
-     - tang
+     - cargo
+     - clang
+     - cryptsetup-devel
+     - curl
+     - dbus-devel
+     - device-mapper-devel
+     - libblkid-devel
+     - make
+     - ncurses
+     - rust
      - systemd
+     - systemd-devel
+     - tang
   - name: Start tang server
     how: shell
     script: systemctl enable tangd.socket --now
   - name: Reload udev
     how: shell
     script: udevadm control --reload
+  - name: Build legacy pool script
+    how: shell
+    script:
+      - PROFILEDIR=debug make build-test-extras
 discover:
   how: fmf
 execute:
diff --git a/test/loop/main.fmf b/test/loop/main.fmf
index 785361b4f6c..a3f610acad0 100644
--- a/test/loop/main.fmf
+++ b/test/loop/main.fmf
@@ -8,5 +8,5 @@ require:
   - python3-dbus-python-client-gen
   - python3-psutil
   - python3-pyudev
-test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata PYTHONPATH=./src make -f Makefile tang-tests dump-metadata-tests
+test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata LEGACY_POOL=../../target/debug/stratis-legacy-pool PYTHONPATH=./src make -f Makefile tang-tests dump-metadata-tests
 path: /tests/client-dbus
diff --git a/test/udev/main.fmf b/test/udev/main.fmf
index af74a1e5a0a..ad3428c2e1c 100644
--- a/test/udev/main.fmf
+++ b/test/udev/main.fmf
@@ -8,5 +8,5 @@ require:
   - python3-dbus-python-client-gen
   - python3-psutil
   - python3-pyudev
-test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata PYTHONPATH=./src make -f Makefile udev-tests
+test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata LEGACY_POOL=../../target/debug/stratis-legacy-pool PYTHONPATH=./src make -f Makefile udev-tests
 path: /tests/client-dbus