Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Gaudi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
Gaudi
Gaudi
Merge requests
!1252
Minor fixes
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Minor fixes
misc-fixes
into
master
Overview
1
Commits
7
Pipelines
3
Changes
3
Merged
Marco Clemencic
requested to merge
misc-fixes
into
master
3 years ago
Overview
1
Commits
7
Pipelines
3
Changes
3
Expand
small clean up in BaseTest.py
fix ROOT dictionary dependency when using subprojects
improve support for Gaudi as a subproject
add configure time sanity check to
gaudi_install
Edited
3 years ago
by
Marco Clemencic
0
0
Merge request reports
Compare
master
version 2
3916d762
3 years ago
version 1
e26b342d
3 years ago
master (base)
and
latest version
latest version
fb93c83c
7 commits,
3 years ago
version 2
3916d762
7 commits,
3 years ago
version 1
e26b342d
5 commits,
3 years ago
3 files
+
31
−
15
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Search (e.g. *.vue) (Ctrl+P)
GaudiPolicy/python/GaudiTesting/BaseTest.py
+
7
−
7
Options
@@ -184,7 +184,7 @@ class BaseTest(object):
else
:
prog
=
"
Gaudi.exe
"
dummy
,
prog_ext
=
os
.
path
.
splitext
(
prog
)
prog_ext
=
os
.
path
.
splitext
(
prog
)
[
1
]
if
prog_ext
not
in
[
"
.exe
"
,
"
.py
"
,
"
.bat
"
]:
prog
+=
"
.exe
"
prog_ext
=
"
.exe
"
@@ -579,7 +579,7 @@ class BaseTest(object):
"
Error Diff
"
,
preproc
=
preproc
)(
stderr
,
result
)
else
:
newcauses
+
=
[
"
missing error reference file
"
]
newcauses
=
[
"
missing error reference file
"
]
causes
+=
newcauses
if
newcauses
and
lreference
:
# Write a new reference file for stdedd
cnt
=
0
@@ -678,19 +678,19 @@ def which(executable):
If the executable cannot be found, None is returned
"""
if
os
.
path
.
isabs
(
executable
):
if
not
os
.
path
.
exists
(
executable
):
if
not
os
.
path
.
isfile
(
executable
):
if
executable
.
endswith
(
'
.exe
'
):
if
os
.
path
.
exists
(
executable
[:
-
4
]):
if
os
.
path
.
isfile
(
executable
[:
-
4
]):
return
executable
[:
-
4
]
else
:
head
,
executable
=
os
.
path
.
split
(
executable
)
executable
=
os
.
path
.
split
(
executable
)
[
1
]
else
:
return
executable
for
d
in
os
.
environ
.
get
(
"
PATH
"
).
split
(
os
.
pathsep
):
fullpath
=
os
.
path
.
join
(
d
,
executable
)
if
os
.
path
.
exists
(
fullpath
):
if
os
.
path
.
isfile
(
fullpath
):
return
fullpath
elif
executable
.
endswith
(
'
.exe
'
)
and
os
.
path
.
exists
(
fullpath
[:
-
4
]):
elif
executable
.
endswith
(
'
.exe
'
)
and
os
.
path
.
isfile
(
fullpath
[:
-
4
]):
return
fullpath
[:
-
4
]
return
None
Loading