Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
43b2fef2
Commit
43b2fef2
authored
Dec 22, 2017
by
Emmanuel Promayon
Browse files
FIXED additional test name should be linked to the component's name
(cherry picked from commit
d257e127
)
parent
dd689f05
Changes
1
Hide whitespace changes
Inline
Side-by-side
sdk/cmake/modules/macros/camitk/test/CamiTKAdditionalActionTest.cmake
View file @
43b2fef2
...
...
@@ -24,22 +24,17 @@
#! testdata dir are used.
#! If provided, only the filenames are required (not the absolute paths) and
#! all the given files should be in the testdata subdir.
#! \param TEST_SUFFIX Optional. suffix name for the additional test. default value is the name of the
#! current component extension.
#!
#! This will add tests named as follow:
#! "component-[name of the current component extension]-additional-[name of the action extension]-level1-[index]"
#!
#! @sa camitk_extension
macro
(
camitk_additional_action_test
)
if
(
NOT PACKAGING_NSIS AND BUILD_TESTING
)
set
(
options
""
)
set
(
oneValueArgs
TEST_SUFFIX
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs ACTION_EXTENSIONS TEST_FILES
)
cmake_parse_arguments
(
CAMITK_ADDITIONAL_ACTION_TEST
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
if
(
CAMITK_ADDITIONAL_ACTION_TEST_TEST_SUFFIX
)
set
(
CAMITK_ADDITIONAL_ACTION_TEST_SUFFIX
${
CAMITK_ADDITIONAL_ACTION_TEST_TEST_SUFFIX
}
)
else
()
set
(
CAMITK_ADDITIONAL_ACTION_TEST_SUFFIX
${
EXTENSION_NAME
}
)
endif
()
cmake_parse_arguments
(
CAMITK_ADDITIONAL_ACTION_TEST
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
# COMPONENT_EXTENSION_PLUGIN_FILE
# determine the extension full file name depending on the plateform
...
...
@@ -117,8 +112,8 @@ macro(camitk_additional_action_test)
foreach
(
ACTION_TESTDATA_FILE
${
TESTFILES
}
)
# Test procedure: Open a file - load an action extension - Apply an action on the component wrapping the file
camitk_add_test
(
EXECUTABLE_ARGS
"-i
${
ACTION_TESTDATA_FILE
}
-a
${
ACTION_EXTENSION_PLUGIN_FILE
}
${
ADDITIONAL_COMPONENT_EXTENSION_ARG
}
"
TEST_SUFFIX
"-additional-
${
CAMITK_ADDITIONAL_ACTION_TEST_SUFFIX
}
-level1-"
PROJECT_NAME
"
action-
${
ACTION_
EXTENSION
}
"
TEST_SUFFIX
"-additional-
${
ACTION_EXTENSION
}
-level1-"
PROJECT_NAME
"
component-
${
EXTENSION
_NAME
}
"
)
# add test to the wiki page information
camitk_parse_test_add
(
NAME
${
CAMITK_TEST_NAME
}
LEVEL 1 DESCRIPTION
"Open a file, load the action and apply it on the component."
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment