Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
senf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
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
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
wiback
senf
Commits
355e80dd
Commit
355e80dd
authored
15 years ago
by
g0dil
Browse files
Options
Downloads
Patches
Plain Diff
Adapt to latest scons Version
parent
1485aeb2
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
SConstruct
+1
-1
1 addition, 1 deletion
SConstruct
senfscons/CompileCheck.py
+4
-3
4 additions, 3 deletions
senfscons/CompileCheck.py
senfscons/SENFSCons.py
+2
-2
2 additions, 2 deletions
senfscons/SENFSCons.py
with
7 additions
and
6 deletions
SConstruct
+
1
−
1
View file @
355e80dd
...
...
@@ -242,7 +242,7 @@ PhonyTarget(env, 'fixlinks', [
'
python doclib/fix-links.py -v -s .svn -s linklint -s debian linklint/errorX.txt linklint/errorAX.txt
'
,
])
PhonyTarget
(
env
,
'
prepare
'
,
[])
PhonyTarget
(
env
,
'
prepare
'
,
[
'
true
'
])
PhonyTarget
(
env
,
'
valgrind
'
,
[
'
find -name .test.bin | while read test; do echo; echo
"
Running $$test
"
; echo; valgrind --tool=memcheck --error-exitcode=99 --suppressions=valgrind.sup $$test $BOOSTTESTARGS; [ $$? -ne 99 ] || exit 1; done
'
...
...
This diff is collapsed.
Click to expand it.
senfscons/CompileCheck.py
+
4
−
3
View file @
355e80dd
import
os
,
os
.
path
,
sys
from
cStringIO
import
StringIO
import
tempfile
from
SCons.Script
import
*
import
SCons.Scanner.C
...
...
@@ -20,13 +20,14 @@ def CompileCheck(target, source, env):
tests
=
scanTests
(
file
(
source
[
0
].
abspath
))
cenv
=
env
.
Clone
()
cenv
.
Append
(
CPPDEFINES
=
{
'
COMPILE_CHECK
'
:
''
}
)
out
=
StringIO
()
out
=
tempfile
.
TemporaryFile
()
cenv
[
'
SPAWN
'
]
=
lambda
sh
,
escape
,
cmd
,
args
,
env
,
pspawn
=
cenv
[
'
PSPAWN
'
],
out
=
out
:
\
pspawn
(
sh
,
escape
,
cmd
,
args
,
env
,
out
,
out
)
Action
(
'
$CXXCOM
'
).
execute
(
target
,
source
,
cenv
)
passedTests
=
{}
delay_name
=
None
for
error
in
out
.
getvalue
().
splitlines
():
out
.
seek
(
0
)
for
error
in
out
.
read
().
splitlines
():
elts
=
error
.
split
(
'
:
'
,
2
)
if
len
(
elts
)
!=
3
:
continue
filename
,
line
,
message
=
elts
...
...
This diff is collapsed.
Click to expand it.
senfscons/SENFSCons.py
+
2
−
2
View file @
355e80dd
...
...
@@ -367,7 +367,7 @@ def Test(env, sources, LIBS = [], OBJECTS = []):
if
compileTestSources
:
test
.
extend
(
env
.
CompileCheck
(
source
=
compileTestSources
))
env
.
Alias
(
'
all_tests
'
,
test
)
env
.
Command
(
env
.
File
(
'
test
'
),
test
,
[])
env
.
Command
(
env
.
File
(
'
test
'
),
test
,
[
'
true
'
])
#env.Alias(env.File('test'), test)
...
...
@@ -422,7 +422,7 @@ def Objects(env, sources, testSources = None, OBJECTS = []):
# Hmm ... here I'd like to use an Alias instead of a file
# however the alias does not seem to live in the subdirectory
# which breaks 'scons -u test'
env
.
Command
(
env
.
File
(
'
test
'
),
test
,
[])
env
.
Command
(
env
.
File
(
'
test
'
),
test
,
[
'
true
'
])
#env.Alias(env.File('test'), test)
return
objects
...
...
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