update testing

diff --git a/testing/Makefile b/testing/Makefile
index fe3e178855cddf3fd3f7e05b2781bc89dc9fe678..1a339c722e963ed23afc54eb14dc2a35bd97ed98 100644 (file)
--- a/testing/Makefile
+++ b/testing/Makefile
@@ -23,7 +23,8 @@ DEFINES  = -DAPIVERSNUM=$(APIVERSNUM) -DAPIVERSION='"$(APIVERSION)"' -DSCAPIVERS
 
 OBJS = misc.o log.o data.o crypto.o parse.o system.o system-common.o smartcard.o network.o filter.o version.o
 SHAREDOBJS = compat.o $(VDRDIR)/tools.o $(VDRDIR)/thread.o
-LIBS = -lpthread -ljpeg -ldl -lcrypto
+LIBS = -lpthread -ljpeg -lcrypto
+DYNLIBS = -ldl $(VDRDIR)/libsi/libsi.a
 
 NOBJS  = $(patsubst %.o,../%.o,$(OBJS))
 
@@ -44,11 +45,11 @@ all: testECM testEMM testN1Emu testN2Emu testN2RunEmu testTPS testExtAU
 
 testECM.o: testECM.c compat.h
 testECM: testECM.o $(SHAREDOBJS) $(NOBJS)
-       $(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) -o $@
+       $(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) $(DYNLIBS) -o $@
 
 testEMM.o: testEMM.c compat.h
 testEMM: testEMM.o $(SHAREDOBJS) $(NOBJS)
-       $(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) -o $@
+       $(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) $(DYNLIBS) -o $@
 
 testN1Emu.o: testN1Emu.c ../systems/nagra/nagra.c ../systems/nagra/nagra1.c ../systems/nagra/cpu.c ../systems/nagra/log-nagra.h
 testN1Emu: testN1Emu.o $(SHAREDOBJS) $(NOBJS)
@@ -70,12 +71,12 @@ testTPS: testTPS.o $(SHAREDOBJS) $(NOBJS)
 
 testExtAU.o: testExtAU.c compat.h
 testExtAU: testExtAU.o $(SHAREDOBJS) $(NOBJS)
-       $(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) -o $@
+       $(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) $(DYNLIBS) -o $@
 
 filterhelper: filterhelper.o
        $(CXX) $(CXXFLAGS) $^ -o $@
 clean:
        @-rm -f *.o core* *~
-       @-rm -f testECM testEMM testN1Emu testN2Emu testN2RunEmu testTPS
+       @-rm -f testECM testEMM testN1Emu testN2Emu testN2RunEmu testTPS testExtAU
        @-rm -f filterhelper
        @-rm -f dump.txt

diff --git a/testing/compat.c b/testing/compat.c
index f6074bcfc5ad4e3795f815436580c64e9d08bf22..e731e91d8a89de18f1026312441c6263c5859eaa 100644 (file)
--- a/testing/compat.c
+++ b/testing/compat.c
@@ -50,6 +50,7 @@ void InitAll(const char *cfgdir)
   logcfg.logCon=1;
   logcfg.noTimestamp=1;
   cSystems::ConfigParse("Cardclient.Immediate","0");
+  cSystems::ConfigParse("Viaccess.TpsAU","1");
 
   filemaps.SetCfgDir(cfgdir);
   cStructLoaders::SetCfgDir(cfgdir);
@@ -482,3 +483,11 @@ int cChannel::Transponder(int Frequency, char Polarization)
     }
   return Frequency;
 }
+
+//
+//
+
+int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+{
+  return 0;
+}

diff --git a/testing/testECM.c b/testing/testECM.c
index 2d61379c1b150ff897037226782678ff191935c6..24334bb6c2839a50dba7a540155b9977e6bed5dd 100644 (file)
--- a/testing/testECM.c
+++ b/testing/testECM.c
@@ -8,6 +8,9 @@
 #include "compat.h"
 #include <vdr/sources.h>
 
+#include <libsi/section.h>
+SI::TOT __dummy;
+
 int main(int argc, char *argv[])
 {
   if(argc<6) {

diff --git a/testing/testEMM.c b/testing/testEMM.c
index 5c59c98d6cf78194e6959077fa9c1ac703e77bd1..9724b77e9ab219ad7ffafee54509f2e371ee9238 100644 (file)
--- a/testing/testEMM.c
+++ b/testing/testEMM.c
@@ -6,6 +6,9 @@
 #include "system.h"
 #include "compat.h"
 
+#include <libsi/section.h>
+SI::TOT __dummy;
+
 int main(int argc, char *argv[])
 {
   if(argc<4) {

diff --git a/testing/testExtAU.c b/testing/testExtAU.c
index c375d976db4018556877311ccc45ed03d42cd019..ace70dfac9c394ac3bdae4d8aa85111473511204 100644 (file)
--- a/testing/testExtAU.c
+++ b/testing/testExtAU.c
@@ -7,6 +7,9 @@
 #include "scsetup.h"
 #include "compat.h"
 
+#include <libsi/section.h>
+SI::TOT __dummy;
+
 void cPlainKeys::TestExternalUpdate(void)
 {
   Lock();