shithub: openh264

Info  •  Files  •  Log  •  Branches

Fix Travis and update test targets.mk (64-bit only for now)

--- a/.travis.yml

+++ b/.travis.yml

@@ -9,5 +9,5 @@

  - sudo apt-get update -qq

  - sudo apt-get install -qq nasm g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev

 install: make gtest-bootstrap

-script: make && make test && make clean && make ENABLE64BIT=Yes && make test && make clean && make BUILDTYPE=Release && make test && make BUILDTYPE=Release clean && make ENABLE64BIT=Yes BUILDTYPE=Release && make test

+script: make ENABLE64BIT=Yes && make test && make clean && make ENABLE64BIT=Yes BUILDTYPE=Release && make test

--- a/test/targets.mk

+++ b/test/targets.mk

@@ -1,6 +1,8 @@

 CODEC_UNITTEST_PREFIX=CODEC_UNITTEST

 CODEC_UNITTEST_SRCDIR=test

 CODEC_UNITTEST_CPP_SRCS=\

+	$(CODEC_UNITTEST_SRCDIR)/./decoder_test.cpp\

+	$(CODEC_UNITTEST_SRCDIR)/./encoder_test.cpp\

 	$(CODEC_UNITTEST_SRCDIR)/./simple_test.cpp\

 CODEC_UNITTEST_OBJS += $(CODEC_UNITTEST_CPP_SRCS:.cpp=.o)