Skip to content

Commit

Permalink
testsuite: move vpc.dev to test directory
Browse files Browse the repository at this point in the history 
Problem: vpc.dev is in etc/devices but is only used in test.

Move it to t/etc.
Update paths used in test scripts.
  • Loading branch information
@garlick
garlick committed Feb 1, 2024
1 parent f4e1ccf commit 0045fbe
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 16 deletions.
3 changes: 0 additions & 3 deletions etc/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ if WITH_PKG_CONFIG
pkgconfig_DATA = libpowerman.pc
endif

check_DATA = \
devices/vpc.dev

pkgsysconfdir = $(sysconfdir)/powerman

pkgsysconf_DATA = \
Expand Down
4 changes: 3 additions & 1 deletion t/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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@

Expand Down
0 etc/devices/vpc.dev → t/etc/vpc.dev
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion t/t0003-api-client.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0004-status-query.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0005-telemetry.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0006-on-off-cycle.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0007-temperature.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0008-beacon.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0009-reset.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0010-device-status.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0011-device-timeout.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0012-device-delay.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0021-remote-powerman.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t0028-issues.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0045fbe

Please sign in to comment.