From 287e66771c268f2019798b6b3e6896914e289b2a Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Fri, 1 Feb 2019 14:01:40 -0500
Subject: [PATCH] fixed tests
Former-commit-id: c330f623a2a45a817238992afccf7efa7e32620b
---
libIRDB-elfdep/test/SConscript | 15 +++------------
libIRDB-elfdep/test/edt.cpp | 10 +++++-----
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/libIRDB-elfdep/test/SConscript b/libIRDB-elfdep/test/SConscript
index 55dd8e67f..3f62a1b03 100644
--- a/libIRDB-elfdep/test/SConscript
+++ b/libIRDB-elfdep/test/SConscript
@@ -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)
diff --git a/libIRDB-elfdep/test/edt.cpp b/libIRDB-elfdep/test/edt.cpp
index 98e1633f1..ff1d95391 100644
--- a/libIRDB-elfdep/test/edt.cpp
+++ b/libIRDB-elfdep/test/edt.cpp
@@ -1,6 +1,6 @@
#include "edt.hpp"
-#include <libElfDep.hpp>
+#include <irdb-elfdep>
#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;
--
GitLab