Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[tests] Use board-mappings.d instead of board-mappings.ini
Directly adding board-mappings.ini is not really supported / useful
anymore, and will be dropped eventually. Move the board-mappings.ini
from the testcases to board-mappings.d which will do the 'merge'
with one file -- but not break when direct board-mappings.ini
installation eventually gets dropped.
  • Loading branch information
Bernd Wachter committed Sep 18, 2014
1 parent e4678e9 commit b57faa4
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 2 deletions.
4 changes: 3 additions & 1 deletion tests/testapplication.pri
Expand Up @@ -8,4 +8,6 @@ INSTALLS += test_data

test_data_etc.path = $${TESTS_DATA_PATH}/configroot/etc/ssu
test_data_usr_share.path = $${TESTS_DATA_PATH}/configroot/usr/share/ssu
INSTALLS += test_data_etc test_data_usr_share
test_data_boardmappings_d.path = $${TESTS_DATA_PATH}/configroot/usr/share/ssu/board-mappings.d

INSTALLS += test_data_etc test_data_usr_share test_data_boardmappings_d
4 changes: 3 additions & 1 deletion tests/ut_deviceinfo/ut_deviceinfo.pro
Expand Up @@ -14,5 +14,7 @@ test_data_etc.files = \

test_data_usr_share.files = \
testdata/ssu-defaults.ini \
testdata/board-mappings.ini \
testdata/repos.ini \

test_data_boardmappings_d.files = \
testdata/board-mappings.ini \
2 changes: 2 additions & 0 deletions tests/ut_ssucli/ut_ssucli.pro
Expand Up @@ -15,4 +15,6 @@ test_data_etc.files = \
test_data_usr_share.files = \
testdata/ssu-defaults.ini \
testdata/repos.ini \

test_data_boardmappings_d.files = \
testdata/board-mappings.ini \
2 changes: 2 additions & 0 deletions tests/ut_ssuurlresolver/ut_ssuurlresolver.pro
Expand Up @@ -18,4 +18,6 @@ test_data_etc.files = \
test_data_usr_share.files = \
testdata/ssu-defaults.ini \
testdata/repos.ini \

test_data_boardmappings_d.files = \
testdata/board-mappings.ini \
2 changes: 2 additions & 0 deletions tests/ut_urlresolver/ut_urlresolver.pro
Expand Up @@ -18,4 +18,6 @@ test_data_etc.files = \
test_data_usr_share.files = \
testdata/ssu-defaults.ini \
testdata/repos.ini \

test_data_boardmappings_d.files = \
testdata/board-mappings.ini \

0 comments on commit b57faa4

Please sign in to comment.