From 0045fbe7402bab1c9ddc38bb8f84970a33a44b8a Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Wed, 31 Jan 2024 10:55:46 -0800 Subject: [PATCH] testsuite: move vpc.dev to test directory Problem: vpc.dev is in etc/devices but is only used in test. Move it to t/etc. Update paths used in test scripts. --- etc/Makefile.am | 3 --- t/Makefile.am | 4 +++- {etc/devices => t/etc}/vpc.dev | 0 t/t0003-api-client.t | 2 +- t/t0004-status-query.t | 2 +- t/t0005-telemetry.t | 2 +- t/t0006-on-off-cycle.t | 2 +- t/t0007-temperature.t | 2 +- t/t0008-beacon.t | 2 +- t/t0009-reset.t | 2 +- t/t0010-device-status.t | 2 +- t/t0011-device-timeout.t | 2 +- t/t0012-device-delay.t | 2 +- t/t0021-remote-powerman.t | 2 +- t/t0028-issues.t | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) rename {etc/devices => t/etc}/vpc.dev (100%) diff --git a/etc/Makefile.am b/etc/Makefile.am index 4fbde859..77df4cf0 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -8,9 +8,6 @@ if WITH_PKG_CONFIG pkgconfig_DATA = libpowerman.pc endif -check_DATA = \ - devices/vpc.dev - pkgsysconfdir = $(sysconfdir)/powerman pkgsysconf_DATA = \ diff --git a/t/Makefile.am b/t/Makefile.am index f09ab2f0..3298d18a 100644 --- a/t/Makefile.am +++ b/t/Makefile.am @@ -57,7 +57,9 @@ EXTRA_DIST= \ aggregate-results.sh \ sharness.sh \ etc/sierra_plugs.conf \ - etc/mcr_plugs.conf + etc/mcr_plugs.conf \ + etc/vpc.dev + AM_CFLAGS = @WARNING_CFLAGS@ diff --git a/etc/devices/vpc.dev b/t/etc/vpc.dev similarity index 100% rename from etc/devices/vpc.dev rename to t/etc/vpc.dev diff --git a/t/t0003-api-client.t b/t/t0003-api-client.t index 2aecd1b4..c5194770 100755 --- a/t/t0003-api-client.t +++ b/t/t0003-api-client.t @@ -8,7 +8,7 @@ powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman test_apiclient=$SHARNESS_BUILD_DIRECTORY/src/powerman/test_apiclient vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0004-status-query.t b/t/t0004-status-query.t index efd08baa..58999e04 100755 --- a/t/t0004-status-query.t +++ b/t/t0004-status-query.t @@ -7,7 +7,7 @@ test_description='Test Powerman status query' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0005-telemetry.t b/t/t0005-telemetry.t index 985b55ce..4b33a741 100755 --- a/t/t0005-telemetry.t +++ b/t/t0005-telemetry.t @@ -7,7 +7,7 @@ test_description='Test Powerman telemetry output' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0006-on-off-cycle.t b/t/t0006-on-off-cycle.t index c0dea2f2..deec32d7 100755 --- a/t/t0006-on-off-cycle.t +++ b/t/t0006-on-off-cycle.t @@ -7,7 +7,7 @@ test_description='Test Powerman power control options' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0007-temperature.t b/t/t0007-temperature.t index 5df27787..8e132bf3 100755 --- a/t/t0007-temperature.t +++ b/t/t0007-temperature.t @@ -7,7 +7,7 @@ test_description='Test Powerman temperature query' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0008-beacon.t b/t/t0008-beacon.t index 5ee102a1..bb713579 100755 --- a/t/t0008-beacon.t +++ b/t/t0008-beacon.t @@ -7,7 +7,7 @@ test_description='Test Powerman beacon options' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0009-reset.t b/t/t0009-reset.t index f7301ce3..e6a52912 100755 --- a/t/t0009-reset.t +++ b/t/t0009-reset.t @@ -7,7 +7,7 @@ test_description='Test Powerman reset control' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0010-device-status.t b/t/t0010-device-status.t index 57954068..04881671 100755 --- a/t/t0010-device-status.t +++ b/t/t0010-device-status.t @@ -7,7 +7,7 @@ test_description='Test Device status command' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0011-device-timeout.t b/t/t0011-device-timeout.t index c883d6e9..72a21582 100755 --- a/t/t0011-device-timeout.t +++ b/t/t0011-device-timeout.t @@ -7,7 +7,7 @@ test_description='Test Device timeouts' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0012-device-delay.t b/t/t0012-device-delay.t index 9e5a5ea6..dbe109ad 100755 --- a/t/t0012-device-delay.t +++ b/t/t0012-device-delay.t @@ -7,7 +7,7 @@ test_description='Ensure that delays are processed expeditiously' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j diff --git a/t/t0021-remote-powerman.t b/t/t0021-remote-powerman.t index f20a6bd0..e2931825 100755 --- a/t/t0021-remote-powerman.t +++ b/t/t0021-remote-powerman.t @@ -7,7 +7,7 @@ test_description='Check powermand as a power control device' powermand=$SHARNESS_BUILD_DIRECTORY/src/powerman/powermand powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman vpcd=$SHARNESS_BUILD_DIRECTORY/t/simulators/vpcd -vpcdev=$SHARNESS_TEST_SRCDIR/../etc/devices/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev powermandev=$SHARNESS_TEST_SRCDIR/../etc/devices/powerman.dev # Use port = 11000 + test number diff --git a/t/t0028-issues.t b/t/t0028-issues.t index d5ca0b97..1c85da7f 100755 --- a/t/t0028-issues.t +++ b/t/t0028-issues.t @@ -9,7 +9,7 @@ powerman=$SHARNESS_BUILD_DIRECTORY/src/powerman/powerman devicesdir=$SHARNESS_TEST_SRCDIR/../etc/devices simdir=$SHARNESS_BUILD_DIRECTORY/t/simulators vpcd=$simdir/vpcd -vpcdev=$devicesdir/vpc.dev +vpcdev=$SHARNESS_TEST_SRCDIR/etc/vpc.dev # Use port = 11000 + test number # That way there won't be port conflicts with make -j