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
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
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
Özgür Ozan Sen
ogs
Commits
6e2b7053
Verified
Commit
6e2b7053
authored
3 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[T] Added option CAT_LOG to OgsTestWrapper.cmake.
When CAT_LOG=True the log is written to stdout instead of LOG_FILE.
parent
4d67e991
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/cmake/test/OgsTestWrapper.cmake
+10
-5
10 additions, 5 deletions
scripts/cmake/test/OgsTestWrapper.cmake
with
10 additions
and
5 deletions
scripts/cmake/test/OgsTestWrapper.cmake
+
10
−
5
View file @
6e2b7053
...
@@ -2,14 +2,19 @@ execute_process(
...
@@ -2,14 +2,19 @@ execute_process(
COMMAND
${
WRAPPER_COMMAND
}
${
EXECUTABLE
}
${
EXECUTABLE_ARGS
}
COMMAND
${
WRAPPER_COMMAND
}
${
EXECUTABLE
}
${
EXECUTABLE_ARGS
}
WORKING_DIRECTORY
${
WORKING_DIRECTORY
}
WORKING_DIRECTORY
${
WORKING_DIRECTORY
}
RESULT_VARIABLE EXIT_CODE
RESULT_VARIABLE EXIT_CODE
OUTPUT_
FI
LE
${
LOG
_FILE
}
OUTPUT_
VARIAB
LE LOG
ERROR_
FI
LE
${
LOG
_FILE
}
ERROR_
VARIAB
LE LOG
)
)
if
(
EXIT_CODE STREQUAL
"0"
)
if
(
EXIT_CODE STREQUAL
"0"
)
if
(
DEFINED ENV{CI}
)
if
(
NOT
DEFINED ENV{CI}
)
file
(
REMOV
E
${
LOG_FILE
}
)
file
(
WRIT
E
${
LOG_FILE
}
"
${
LOG
}
"
)
endif
()
endif
()
else
()
else
()
message
(
FATAL_ERROR
"Exit code:
${
EXIT_CODE
}
; log file:
${
LOG_FILE
}
"
)
if
(
CAT_LOG
)
message
(
FATAL_ERROR
"Exit code:
${
EXIT_CODE
}
; log:
\n
${
LOG
}
"
)
else
()
file
(
WRITE
${
LOG_FILE
}
"
${
LOG
}
"
)
message
(
FATAL_ERROR
"Exit code:
${
EXIT_CODE
}
; log file:
${
LOG_FILE
}
"
)
endif
()
endif
()
endif
()
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