[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:43:29 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=10f21d2
The following commit has been merged in the master branch:
commit 10f21d249fb30c468d1765679d803647b54e5ed6
Author: Robin Mills <robin at clanmills.com>
Date: Sat Oct 20 04:13:58 2012 +0000
Fix: #858. Download video data on demand. More discussion in issue report.
---
CMakeLists.txt | 6 ++++--
config/Makefile.in | 8 +++++++-
test/Makefile | 40 +++++++++++++++++++++++++++++++++++-----
3 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0104e66..259f4b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,10 +185,12 @@ ENDIF()
##
# tests
-ADD_CUSTOM_TARGET(tests COMMAND make test "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
+ADD_CUSTOM_TARGET(tests COMMAND make test "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
+ADD_CUSTOM_TARGET(teste COMMAND make teste "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
+ADD_CUSTOM_TARGET(testv COMMAND make testv "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
##
-# support for test suite TODO: fixup for MSVC and think a bit more about this
+# support for test suite TODO: fixup for MSVC and think a bit more before deploying this
# ENABLE_TESTING()
# INCLUDE(Dart)
# ADD_TEST(tests bash -c "cd ${CMAKE_SOURCE_DIR}/test/ ; make EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" )
diff --git a/config/Makefile.in b/config/Makefile.in
index 885c1a3..bcbd067 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -54,7 +54,7 @@ ENABLE_XMP = @ENABLE_XMP@
.PHONY: all doc config samples xmpsdk \
mostlyclean clean distclean maintainer-clean \
- install uninstall tests
+ install uninstall tests teste testv
all install: config/config.mk xmpsdk
cd src && $(MAKE) $(MAKECMDGOALS)
@@ -73,6 +73,12 @@ samples: config/config.mk
tests:
cd test && $(MAKE) test
+teste:
+ cd test && $(MAKE) teste
+
+testv:
+ cd test && $(MAKE) testv
+
config:
cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
diff --git a/test/Makefile b/test/Makefile
index 78a32b9..0ac3d20 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -54,12 +54,19 @@ SHELL = /bin/sh
# ******************************************************************************
# Targets
-.PHONY: all test clean distclean maintainer-clean
+.PHONY: all test testv teste clean distclean maintainer-clean
+##
+# to save download time for simple build/test, we download video and eps data on demand
+# TODO: remove data/eps from depot for the 0.24 release.
+# If we remove it now, it'll break the test instructions on the web:
+# http://www.exiv2.org/download.html
+SVN = svn://dev.exiv2.org/svn/testdata/trunk
+
+##
# Add test drivers to this list
TESTS = addmoddel.sh \
bugfixes-test.sh \
- eps-test.sh \
exifdata-test.sh \
exiv2-test.sh \
imagetest.sh \
@@ -73,8 +80,9 @@ TESTS = addmoddel.sh \
write-test.sh \
write2-test.sh \
xmpparser-test.sh \
- conversions.sh \
- video-test.sh
+ conversions.sh
+TESTV = video-test.sh
+TESTE = eps-test.sh
test:
@list='$(TESTS)'; for p in $$list; do \
@@ -82,8 +90,27 @@ test:
./$$p; \
done
+testv:
+ @for t in /video ; do \
+ if [ ! -e data/$$t ]; then \
+ echo svn export '$(SVN)'$$t data$$t ; \
+ svn export '$(SVN)'$$t data$$t ; \
+ fi ; done
+ @list='$(TESTV)'; for p in $$list; do \
+ echo Running $$p ...; \
+ ./$$p; \
+ done
+
+##
+# TODO: download eps data on demand for 0.24 (similar to testv)
+teste:
+ @list='$(TESTE)'; for p in $$list; do \
+ echo Running $$p ...; \
+ ./$$p; \
+ done
+
clean:
- rm -rf $(top_srcdir)/test/tmp/*
+ rm -rf $(top_srcdir)/test/tmp/* data/video data/eps
distclean: clean
$(RM) *~ *.bak *#
@@ -91,3 +118,6 @@ distclean: clean
# This command is intended for maintainers to use; it deletes files
# that may need special tools to rebuild.
maintainer-clean: distclean
+
+# That's all Folks!
+##
\ No newline at end of file
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list