summaryrefslogtreecommitdiffstats
path: root/test/afb-test/etc
diff options
context:
space:
mode:
Diffstat (limited to 'test/afb-test/etc')
-rw-r--r--test/afb-test/etc/CMakeLists.txt6
-rw-r--r--test/afb-test/etc/aft-agl-service-low-can.json.in (renamed from test/afb-test/etc/aft-agl-service-low-can.json)2
2 files changed, 6 insertions, 2 deletions
diff --git a/test/afb-test/etc/CMakeLists.txt b/test/afb-test/etc/CMakeLists.txt
index cd4beb91..b4617ac8 100644
--- a/test/afb-test/etc/CMakeLists.txt
+++ b/test/afb-test/etc/CMakeLists.txt
@@ -20,8 +20,12 @@
# Low-CAN test configuration files
##################################################
PROJECT_TARGET_ADD(afb-test-config)
+ if(WITH_FEATURE_J1939)
+ set(J1939_TEST_CONFFILE ",\"low-can_J1939Test.lua\"")
+ endif()
- file(GLOB CONF_FILES "*.json")
+ configure_file("aft-agl-service-low-can.json.in" "aft-agl-service-low-can.json")
+ file(GLOB CONF_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.json")
add_input_files("${CONF_FILES}")
diff --git a/test/afb-test/etc/aft-agl-service-low-can.json b/test/afb-test/etc/aft-agl-service-low-can.json.in
index ebe7ed47..88bd9199 100644
--- a/test/afb-test/etc/aft-agl-service-low-can.json
+++ b/test/afb-test/etc/aft-agl-service-low-can.json.in
@@ -16,7 +16,7 @@
"action": "lua://AFT#_launch_test",
"args": {
"trace": "low-can",
- "files": ["low-can_BasicAPITest.lua", "low-can_FilterTest01.lua"]
+ "files": ["low-can_BasicAPITest.lua", "low-can_FilterTest01.lua"@J1939_TEST_CONFFILE@]
}
}
}