Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangjie
OpenXG-RAN
Commits
2098dcdd
Commit
2098dcdd
authored
Sep 24, 2016
by
Rohit Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Gitlab CI: minor fix to how processes are terminated
parent
1edceeb6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
+4
-4
No files found.
cmake_targets/autotests/run_exec_lte-softmodem_tests.py
View file @
2098dcdd
...
@@ -588,7 +588,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
...
@@ -588,7 +588,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
RRH_pre_exec_args
=
testcase
.
findtext
(
'RRH_pre_exec_args'
,
default
=
''
)
RRH_pre_exec_args
=
testcase
.
findtext
(
'RRH_pre_exec_args'
,
default
=
''
)
RRH_main_exec
=
testcase
.
findtext
(
'RRH_main_exec'
,
default
=
''
)
RRH_main_exec
=
testcase
.
findtext
(
'RRH_main_exec'
,
default
=
''
)
RRH_main_exec_args
=
testcase
.
findtext
(
'RRH_main_exec_args'
,
default
=
''
)
RRH_main_exec_args
=
testcase
.
findtext
(
'RRH_main_exec_args'
,
default
=
''
)
RRH_terminate_missing_procs
=
testcase
.
findtext
(
'RRH_terminate_missing_procs'
,
default
=
'
Tru
e'
)
RRH_terminate_missing_procs
=
testcase
.
findtext
(
'RRH_terminate_missing_procs'
,
default
=
'
Fals
e'
)
eNBMachine
=
testcase
.
findtext
(
'eNB'
,
default
=
''
)
eNBMachine
=
testcase
.
findtext
(
'eNB'
,
default
=
''
)
...
@@ -601,7 +601,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
...
@@ -601,7 +601,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
eNB_main_exec_args
=
testcase
.
findtext
(
'eNB_main_exec_args'
,
default
=
''
)
eNB_main_exec_args
=
testcase
.
findtext
(
'eNB_main_exec_args'
,
default
=
''
)
eNB_traffic_exec
=
testcase
.
findtext
(
'eNB_traffic_exec'
,
default
=
''
)
eNB_traffic_exec
=
testcase
.
findtext
(
'eNB_traffic_exec'
,
default
=
''
)
eNB_traffic_exec_args
=
testcase
.
findtext
(
'eNB_traffic_exec_args'
,
default
=
''
)
eNB_traffic_exec_args
=
testcase
.
findtext
(
'eNB_traffic_exec_args'
,
default
=
''
)
eNB_terminate_missing_procs
=
testcase
.
findtext
(
'eNB_terminate_missing_procs'
,
default
=
'
Tru
e'
)
eNB_terminate_missing_procs
=
testcase
.
findtext
(
'eNB_terminate_missing_procs'
,
default
=
'
Fals
e'
)
eNB_search_expr_true
=
testcase
.
findtext
(
'eNB_search_expr_true'
,
''
)
eNB_search_expr_true
=
testcase
.
findtext
(
'eNB_search_expr_true'
,
''
)
if
re
.
compile
(
'\w+'
).
match
(
eNB_search_expr_true
)
!=
None
:
if
re
.
compile
(
'\w+'
).
match
(
eNB_search_expr_true
)
!=
None
:
eNB_search_expr_true
=
eNB_search_expr_true
+
' duration='
+
str
(
timeout_cmd
-
90
)
+
's'
eNB_search_expr_true
=
eNB_search_expr_true
+
' duration='
+
str
(
timeout_cmd
-
90
)
+
's'
...
@@ -616,7 +616,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
...
@@ -616,7 +616,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
UE_main_exec_args
=
testcase
.
findtext
(
'UE_main_exec_args'
,
default
=
''
)
UE_main_exec_args
=
testcase
.
findtext
(
'UE_main_exec_args'
,
default
=
''
)
UE_traffic_exec
=
testcase
.
findtext
(
'UE_traffic_exec'
,
default
=
''
)
UE_traffic_exec
=
testcase
.
findtext
(
'UE_traffic_exec'
,
default
=
''
)
UE_traffic_exec_args
=
testcase
.
findtext
(
'UE_traffic_exec_args'
,
default
=
''
)
UE_traffic_exec_args
=
testcase
.
findtext
(
'UE_traffic_exec_args'
,
default
=
''
)
UE_terminate_missing_procs
=
testcase
.
findtext
(
'UE_terminate_missing_procs'
,
default
=
'
Tru
e'
)
UE_terminate_missing_procs
=
testcase
.
findtext
(
'UE_terminate_missing_procs'
,
default
=
'
Fals
e'
)
UE_search_expr_true
=
testcase
.
findtext
(
'UE_search_expr_true'
,
''
)
UE_search_expr_true
=
testcase
.
findtext
(
'UE_search_expr_true'
,
''
)
UE_stop_script
=
testcase
.
findtext
(
'UE_stop_script'
,
''
)
UE_stop_script
=
testcase
.
findtext
(
'UE_stop_script'
,
''
)
if
re
.
compile
(
'\w+'
).
match
(
UE_search_expr_true
)
!=
None
:
if
re
.
compile
(
'\w+'
).
match
(
UE_search_expr_true
)
!=
None
:
...
@@ -637,7 +637,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
...
@@ -637,7 +637,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
HSS_main_exec_args
=
testcase
.
findtext
(
'HSS_main_exec_args'
,
default
=
''
)
HSS_main_exec_args
=
testcase
.
findtext
(
'HSS_main_exec_args'
,
default
=
''
)
EPC_traffic_exec
=
testcase
.
findtext
(
'EPC_traffic_exec'
,
default
=
''
)
EPC_traffic_exec
=
testcase
.
findtext
(
'EPC_traffic_exec'
,
default
=
''
)
EPC_traffic_exec_args
=
testcase
.
findtext
(
'EPC_traffic_exec_args'
,
default
=
''
)
EPC_traffic_exec_args
=
testcase
.
findtext
(
'EPC_traffic_exec_args'
,
default
=
''
)
EPC_terminate_missing_procs
=
testcase
.
findtext
(
'EPC_terminate_missing_procs'
,
default
=
'
Tru
e'
)
EPC_terminate_missing_procs
=
testcase
.
findtext
(
'EPC_terminate_missing_procs'
,
default
=
'
Fals
e'
)
EPC_search_expr_true
=
testcase
.
findtext
(
'EPC_search_expr_true'
,
''
)
EPC_search_expr_true
=
testcase
.
findtext
(
'EPC_search_expr_true'
,
''
)
if
re
.
compile
(
'\w+'
).
match
(
EPC_search_expr_true
)
!=
None
:
if
re
.
compile
(
'\w+'
).
match
(
EPC_search_expr_true
)
!=
None
:
EPC_search_expr_true
=
EPC_search_expr_true
+
' duration='
+
str
(
timeout_cmd
-
90
)
+
's'
EPC_search_expr_true
=
EPC_search_expr_true
+
' duration='
+
str
(
timeout_cmd
-
90
)
+
's'
...
...
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