← Back to branch summary

~greg.grossmeier/exempi/trunk

« back to all changes in this revision

Viewing changes to exempi/tests/Makefile.am

  • Committer: Hubert Figuière
  • Date: 2014-04-22 18:02:25 UTC
  • mfrom: (181.1.9)
  • Revision ID: git-v1:5013ac34dda98b65d8916eca1303488abaade995
Merge branch 'exempi-2.3-branch'

Conflicts:
        samples/source/common/LargeFileAccess.cpp
        source/XMPFiles/FileHandlers/MP3_Handler.cpp
        source/XMPFiles/FormatSupport/ID3_Support.hpp

Show diffs side-by-side

added added

removed removed

Lines of Context:
exempi/tests/Makefile.am
43
43
TESTS = testcore.sh testinit testexempicore testserialise testwritenewprop \
44
44
        testtiffleak testxmpfiles testxmpfileswrite \
45
45
        test3 testfdo18635 testcpp
46
 
TESTS_ENVIRONMENT = TEST_DIR=$(srcdir) BOOST_TEST_CATCH_SYSTEM_ERRORS=no @VALGRIND@
 
46
TESTS_ENVIRONMENT = TEST_DIR=$(srcdir) BOOST_TEST_CATCH_SYSTEM_ERRORS=no VALGRIND="$(VALGRIND)" @VALGRIND@
47
47
endif
48
48
check_SCRIPTS = testcore.sh
49
49
 
94
94
 
95
95
testcpp_SOURCES = testcpp.cpp utils.cpp
96
96
testcpp_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
97
 
testcpp_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
 
 
b'\\ No newline at end of file'
 
97
testcpp_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@