Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
Zipr Toolchain
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
Container Registry
Model registry
Operate
Environments
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
Open Source Software
Zipr Toolchain
Commits
287e6677
Commit
287e6677
authored
6 years ago
by
Jason Hiser
Browse files
Options
Downloads
Patches
Plain Diff
fixed tests
Former-commit-id: c330f623a2a45a817238992afccf7efa7e32620b
parent
49a89768
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libIRDB-elfdep/test/SConscript
+3
-12
3 additions, 12 deletions
libIRDB-elfdep/test/SConscript
libIRDB-elfdep/test/edt.cpp
+5
-5
5 additions, 5 deletions
libIRDB-elfdep/test/edt.cpp
with
8 additions
and
17 deletions
libIRDB-elfdep/test/SConscript
+
3
−
12
View file @
287e6677
...
...
@@ -11,21 +11,12 @@ myenv.Replace(ZIPR_HOME=os.environ['ZIPR_HOME'])
myenv
.
Replace
(
ZIPR_SDK
=
os
.
environ
[
'
ZIPR_SDK
'
])
myenv
.
Replace
(
IRDB_SDK
=
os
.
environ
[
'
IRDB_SDK
'
])
myenv
.
Replace
(
ZIPR_INSTALL
=
os
.
environ
[
'
ZIPR_INSTALL
'
])
myenv
.
Replace
(
CXXFLAGS
=
"
-g -std=c++11 -Wall
"
)
myenv
.
Append
(
LINKFLAGS
=
"
-Wl,-unresolved-symbols=ignore-in-shared-libs
"
)
cpppath
=
'''
$IRDB_SDK/include
$SECURITY_TRANSFORMS_HOME/include
$SECURITY_TRANSFORMS_HOME/libIRDB/include
$SECURITY_TRANSFORMS_HOME/libMEDSannotation/include
$SECURITY_TRANSFORMS_HOME/beaengine/include
$SECURITY_TRANSFORMS_HOME/libtransform/include
$SECURITY_TRANSFORMS_HOME/libStructDiv/include
$SECURITY_TRANSFORMS_HOME/libEXEIO/include
$SECURITY_TRANSFORMS_HOME/libElfDep/include
$SMPSA_HOME/include
$ZIPR_HOME/include
$ZIPR_SDK/include
'''
...
...
@@ -34,7 +25,7 @@ files=Glob( Dir('.').srcnode().abspath+"/edt*.cpp")
pgm
=
"
edt.exe
"
LIBPATH
=
"
$SECURITY_TRANSFORMS_HOME/lib
"
LIBS
=
Split
(
"
stars
"
+
myenv
.
subst
(
'
$BASE_IRDB_LIBS
'
)
+
"
irdb-elfdep
"
)
LIBS
=
Split
(
"
irdb-core irdb-transform
irdb-elfdep
"
)
myenv
=
myenv
.
Clone
(
CPPPATH
=
Split
(
cpppath
))
pgm
=
myenv
.
Program
(
pgm
,
files
,
LIBPATH
=
LIBPATH
,
LIBS
=
LIBS
)
install
=
myenv
.
Install
(
"
$SECURITY_TRANSFORMS_HOME/plugins_install/
"
,
pgm
)
...
...
This diff is collapsed.
Click to expand it.
libIRDB-elfdep/test/edt.cpp
+
5
−
5
View file @
287e6677
#include
"edt.hpp"
#include
<
libElfDep.hp
p>
#include
<
irdb-elfde
p>
#include
<algorithm>
using
namespace
IRDB_SDK
;
...
...
@@ -20,10 +20,10 @@ ElfDep_Tester_t::ElfDep_Tester_t(FileIR_t* firp)
int
ElfDep_Tester_t
::
execute
()
{
// insert the PLT and GOT entries needed
auto
ed
=
libIRDB
::
ElfDependencies_t
(
getFileIR
());
(
void
)
ed
.
appendLibraryDepedencies
(
"libelf_dep_test.so"
);
auto
edpcb
=
ed
.
appendPltEntry
(
"elf_dep_test_callback"
);
auto
edvar
=
ed
.
appendGotEntry
(
"elf_dep_test_var"
);
auto
ed
=
ElfDependencies_t
::
factory
(
getFileIR
());
(
void
)
ed
->
appendLibraryDepedencies
(
"libelf_dep_test.so"
);
auto
edpcb
=
ed
->
appendPltEntry
(
"elf_dep_test_callback"
);
auto
edvar
=
ed
->
appendGotEntry
(
"elf_dep_test_var"
);
auto
edvar_scoop
=
edvar
.
first
;
auto
edvar_offset
=
edvar
.
second
;
...
...
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