Skip to content

Commit 19c407f

Browse files
committed
fstests: fix fstests_test_dev variable setting
commit 4947aef ("fstests: use selective yaml output on a slew of different variables") removed FSTESTS_TEST_DEV variable setup but the propagation for the variable to extra vars was still being relied upon with: FSTESTS_ARGS += fstests_test_dev='$(FSTESTS_TEST_DEV)' Since FSTESTS_TEST_DEV is empty we were setting fstests_test_dev to an empty string and the ansible task that ran gendisks.sh would fail. Fix this by removing fstests_test_dev variable propagation using the old scheme and just use selective yaml output with "output yaml" below the symbol name on the respective Kconfig symbol declaration. Reported-by: Carlos Maiolino <[email protected]> Signed-off-by: Luis Chamberlain <[email protected]>
1 parent 742d6fe commit 19c407f

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

workflows/fstests/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ endif # FSTESTS_TESTDEV_SPARSEFILE_GENERATION
601601

602602
config FSTESTS_TEST_DEV
603603
string "The device to use TEST_DEV on fstests"
604+
output yaml
604605
default "/dev/loop16" if FSTESTS_TESTDEV_SPARSEFILE_GENERATION
605606
depends on FSTESTS_TESTDEV_SPARSEFILE_GENERATION
606607
help

workflows/fstests/Makefile.sparsefiles

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FSTESTS_ARGS += fstests_testdev_sparsefile_generation='True'
22

3-
FSTESTS_ARGS += fstests_test_dev='$(FSTESTS_TEST_DEV)'
43
FSTESTS_LOGWRITES_DEV:=$(subst ",,$(CONFIG_FSTESTS_LOGWRITES_DEV))
54
FSTESTS_ARGS += fstests_logwrites_dev='$(FSTESTS_LOGWRITES_DEV)'
65

0 commit comments

Comments
 (0)