Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mojtaba Abdolkhani
ogs
Commits
63c4705e
Commit
63c4705e
authored
2 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[cmake] Cleanup.
parent
169c1d96
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/cmake/test/AddTestTester.cmake
+2
-7
2 additions, 7 deletions
scripts/cmake/test/AddTestTester.cmake
scripts/cmake/test/NotebookTest.cmake
+3
-17
3 additions, 17 deletions
scripts/cmake/test/NotebookTest.cmake
with
5 additions
and
24 deletions
scripts/cmake/test/AddTestTester.cmake
+
2
−
7
View file @
63c4705e
set
(
_exec_process_args
""
)
if
(
${
CMAKE_VERSION
}
VERSION_GREATER_EQUAL 3.18
)
set
(
_exec_process_args ECHO_OUTPUT_VARIABLE ECHO_ERROR_VARIABLE
)
endif
()
message
(
STATUS
"running tester (glob mode:
${
GLOB_MODE
}
):
${
TESTER_COMMAND
}
"
)
if
(
WIN32
)
...
...
@@ -49,7 +44,7 @@ foreach(cmd ${TESTER_COMMAND})
WORKING_DIRECTORY
${
SOURCE_PATH
}
RESULT_VARIABLE EXIT_CODE
OUTPUT_VARIABLE OUTPUT
ERROR_VARIABLE OUTPUT
${
_exec_process_args
}
ERROR_VARIABLE OUTPUT
ECHO_OUTPUT_VARIABLE ECHO_ERROR_VARIABLE
)
if
(
NOT EXIT_CODE STREQUAL
"0"
)
file
(
WRITE
${
LOG_FILE
}
${
OUTPUT
}
)
...
...
@@ -67,7 +62,7 @@ foreach(cmd ${TESTER_COMMAND})
WORKING_DIRECTORY
${
SOURCE_PATH
}
RESULT_VARIABLE EXIT_CODE
OUTPUT_VARIABLE OUTPUT
ERROR_VARIABLE OUTPUT
${
_exec_process_args
}
ERROR_VARIABLE OUTPUT
ECHO_OUTPUT_VARIABLE ECHO_ERROR_VARIABLE
)
if
(
NOT EXIT_CODE STREQUAL
"0"
)
file
(
WRITE
${
LOG_FILE
}
${
OUTPUT
}
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/test/NotebookTest.cmake
+
3
−
17
View file @
63c4705e
...
...
@@ -75,23 +75,9 @@ function(NotebookTest)
list
(
APPEND labels large
)
endif
()
if
(
MSVC AND
${
CMAKE_VERSION
}
VERSION_LESS 3.22
)
# ENVIRONMENT_MODIFICATION parameter of set_tests_properties() is
# required to correctly set the PATH environment variable on Windows.
message
(
WARNING
"Notebook tests are disabled on Windows when CMake < 3.22!"
)
return
()
endif
()
if
(
${
CMAKE_VERSION
}
VERSION_LESS 3.22
)
# This branch applies to *nix only.
set
(
_prop_env ENVIRONMENT PATH=$<TARGET_FILE_DIR:ogs>:$ENV{PATH}
)
else
()
set
(
_prop_env ENVIRONMENT_MODIFICATION
PATH=path_list_prepend:$<TARGET_FILE_DIR:ogs>
)
endif
()
set
(
_prop_env ENVIRONMENT_MODIFICATION
PATH=path_list_prepend:$<TARGET_FILE_DIR:ogs>
)
set_tests_properties
(
${
TEST_NAME
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment