Commit b57faa45 authored by Aard's avatar Aard

[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.
parent e4678e90
...@@ -8,4 +8,6 @@ INSTALLS += test_data ...@@ -8,4 +8,6 @@ INSTALLS += test_data
test_data_etc.path = $${TESTS_DATA_PATH}/configroot/etc/ssu test_data_etc.path = $${TESTS_DATA_PATH}/configroot/etc/ssu
test_data_usr_share.path = $${TESTS_DATA_PATH}/configroot/usr/share/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
...@@ -10,9 +10,11 @@ SOURCES = \ ...@@ -10,9 +10,11 @@ SOURCES = \
deviceinfotest.cpp \ deviceinfotest.cpp \
test_data_etc.files = \ test_data_etc.files = \
testdata/ssu.ini \ testdata/ssu.ini \
test_data_usr_share.files = \ test_data_usr_share.files = \
testdata/ssu-defaults.ini \ testdata/ssu-defaults.ini \
testdata/board-mappings.ini \
testdata/repos.ini \ testdata/repos.ini \
test_data_boardmappings_d.files = \
testdata/board-mappings.ini \
\ No newline at end of file
...@@ -15,4 +15,6 @@ test_data_etc.files = \ ...@@ -15,4 +15,6 @@ test_data_etc.files = \
test_data_usr_share.files = \ test_data_usr_share.files = \
testdata/ssu-defaults.ini \ testdata/ssu-defaults.ini \
testdata/repos.ini \ testdata/repos.ini \
testdata/board-mappings.ini \
test_data_boardmappings_d.files = \
testdata/board-mappings.ini \
\ No newline at end of file
...@@ -6,16 +6,18 @@ CONFIG += link_pkgconfig ...@@ -6,16 +6,18 @@ CONFIG += link_pkgconfig
PKGCONFIG += libzypp PKGCONFIG += libzypp
HEADERS = \ HEADERS = \
ssuurlresolvertest.h \ ssuurlresolvertest.h \
SOURCES = \ SOURCES = \
main.cpp \ main.cpp \
ssuurlresolvertest.cpp \ ssuurlresolvertest.cpp \
test_data_etc.files = \ test_data_etc.files = \
testdata/ssu.ini \ testdata/ssu.ini \
test_data_usr_share.files = \ test_data_usr_share.files = \
testdata/ssu-defaults.ini \ testdata/ssu-defaults.ini \
testdata/repos.ini \ testdata/repos.ini \
testdata/board-mappings.ini \
test_data_boardmappings_d.files = \
testdata/board-mappings.ini \
\ No newline at end of file
...@@ -13,9 +13,11 @@ test_data.files = \ ...@@ -13,9 +13,11 @@ test_data.files = \
testdata/mykey.key \ testdata/mykey.key \
test_data_etc.files = \ test_data_etc.files = \
testdata/ssu.ini \ testdata/ssu.ini \
test_data_usr_share.files = \ test_data_usr_share.files = \
testdata/ssu-defaults.ini \ testdata/ssu-defaults.ini \
testdata/repos.ini \ testdata/repos.ini \
testdata/board-mappings.ini \
test_data_boardmappings_d.files = \
testdata/board-mappings.ini \
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment