pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

brlcad: Extend tests to target check and unit; fix repository test



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Oct 23 23:20:54 2016 +0200
Changeset:	4b08c7068423d7c61fa0f0e6152d76520a5cbf4d

Modified Files:
	brlcad/Makefile
	brlcad/distinfo
Added Files:
	brlcad/patches/patch-regress_repository.sh

Log Message:
brlcad: Extend tests to target check and unit; fix repository test

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4b08c7068423d7c61fa0f0e6152d76520a5cbf4d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 brlcad/Makefile                            |  8 +-------
 brlcad/distinfo                            |  1 +
 brlcad/patches/patch-regress_repository.sh | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diffs:
diff --git a/brlcad/Makefile b/brlcad/Makefile
index 5aec839..f0e9f3c 100644
--- a/brlcad/Makefile
+++ b/brlcad/Makefile
@@ -94,7 +94,7 @@ REPLACE_FILES.awk=	src/other/freetype/builds/atari/deflinejoiner.awk
 REPLACE_PERL+=		src/proc-db/metaballs.pl
 REPLACE_PERL+=		src/proc-db/spiral.pl
 
-TEST_TARGET=		test
+TEST_TARGET=		test check unit regress
 
 benchmark: build
 	${RUN}${_ULIMIT_CMD}						\
@@ -102,12 +102,6 @@ benchmark: build
 		${PKGSRC_SETENV} ${TEST_ENV} ${MAKE_PROGRAM}		\
 			${MAKE_FLAGS} ${TEST_MAKE_FLAGS} benchmark
 
-regress: build
-	${RUN}${_ULIMIT_CMD}						\
-		cd ${WRKSRC} &&						\
-		${PKGSRC_SETENV} ${TEST_ENV} ${MAKE_PROGRAM}		\
-			${MAKE_FLAGS} ${TEST_MAKE_FLAGS} regress
-
 # .include "../../wip/tk-itk3/buildlink3.mk" # built-in
 # .include "../../wip/tkpng/buildlink3.mk" # built-in
 # .include "../../wip/tcl-iwidgets/buildlink3.mk" # built-in
diff --git a/brlcad/distinfo b/brlcad/distinfo
index 4989bfa..262ff58 100644
--- a/brlcad/distinfo
+++ b/brlcad/distinfo
@@ -7,6 +7,7 @@ Size (brlcad-7.26.0.tar.bz2) = 113073230 bytes
 SHA1 (patch-CMakeLists.txt) = ec1955dc1543fd2b6ba5a56ebf350980ac42f7df
 SHA1 (patch-misc_CMake_CompilerFlags.cmake) = 0831bd3376e2838fbd4a08be2121db73fba3db56
 SHA1 (patch-misc_CMake_ThirdParty.cmake) = 03cb989aa4de0a07e146bc80facd649946a9688b
+SHA1 (patch-regress_repository.sh) = ec31fe38033f33201e7fe709a121754b74f478df
 SHA1 (patch-src_conv_iges_main.c) = 67d9315e43313e57efd3cfeb489f035cfa8f58f6
 SHA1 (patch-src_libbu_uce-dirent.h) = 82c0f1c67316b5ddcde50c69a0f746471eaf10c6
 SHA1 (patch-src_librt_primitives_bot_gct__decimation_meshdecimation.c) = c76104ad99c8714379ad7e01b806a2f30cda4f05
diff --git a/brlcad/patches/patch-regress_repository.sh b/brlcad/patches/patch-regress_repository.sh
new file mode 100644
index 0000000..7af0c3e
--- /dev/null
+++ b/brlcad/patches/patch-regress_repository.sh
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- regress/repository.sh.orig	2016-08-09 06:49:56.000000000 +0000
++++ regress/repository.sh
+@@ -58,12 +58,12 @@ fi
+ 
+ # get a source and header file list so we only walk the sources once
+ 
+-SRCFILES="`find src -type f \( -name \*.c -o -name \*.cpp -o -name \*.cxx -o -name \*.cc -o -name \*.h -o -name \*.y -o -name \*.l \) -not -regex '.*src/other.*' -not -regex '.*misc/tools.*' -not -regex '.*misc/svn2git.*' -not -regex '.*~' -not -regex '.*\.log' -not -regex '.*Makefile.*' -not -regex '.*cache.*' -not -regex '.*\.svn.*' -not -regex '.*src/libpkg.*' -not -regex '.*/shapelib/.*'`"
++SRCFILES="`find src -type f \( -name \*.c -o -name \*.cpp -o -name \*.cxx -o -name \*.cc -o -name \*.h -o -name \*.y -o -name \*.l \) '!' -regex '.*src/other.*' '!' -regex '.*misc/tools.*' '!' -regex '.*misc/svn2git.*' '!' -regex '.*~' '!' -regex '.*\.log' '!' -regex '.*Makefile.*' '!' -regex '.*cache.*' '!' -regex '.*\.svn.*' '!' -regex '.*src/libpkg.*' '!' -regex '.*/shapelib/.*'`"
+ 
+-INCFILES="`find include -type f \( -name \*.c -o -name \*.cpp -o -name \*.cxx -o -name \*.cc -o -name \*.h -o -name \*.y -o -name \*.l \) -not -regex '.*src/other.*' -not -regex '.*misc/tools.*' -not -regex '.*misc/svn2git.*' -not -regex '.*~' -not -regex '.*\.log' -not -regex '.*Makefile.*' -not -regex '.*cache.*' -not -regex '.*\.svn.*' -not -regex '.*pkg.h'`"
++INCFILES="`find include -type f \( -name \*.c -o -name \*.cpp -o -name \*.cxx -o -name \*.cc -o -name \*.h -o -name \*.y -o -name \*.l \) '!' -regex '.*src/other.*' '!' -regex '.*misc/tools.*' '!' -regex '.*misc/svn2git.*' '!' -regex '.*~' '!' -regex '.*\.log' '!' -regex '.*Makefile.*' '!' -regex '.*cache.*' '!' -regex '.*\.svn.*' '!' -regex '.*pkg.h'`"
+ 
+-BLDFILES="`find src -type f \( -name \*.cmake -o -name CMakeLists.txt \) -not -regex '.*src/other.*' -not -regex '.*misc/tools.*' -not -regex '.*misc/svn2git.*' -not -regex '.*~' -not -regex '.*cache.*' -not -regex '.*\.svn.*'`
+-`find misc -type f \( -name \*.cmake -o -name CMakeLists.txt \) -not -regex '.*src/other.*' -not -regex '.*misc/tools.*' -not -regex '.*misc/svn2git.*' -not -regex '.*~' -not -regex '.*cache.*' -not -regex '.*\.svn.*' -not -regex '.*autoheader.*'`
++BLDFILES="`find src -type f \( -name \*.cmake -o -name CMakeLists.txt \) '!' -regex '.*src/other.*' '!' -regex '.*misc/tools.*' '!' -regex '.*misc/svn2git.*' '!' -regex '.*~' '!' -regex '.*cache.*' '!' -regex '.*\.svn.*'`
++`find misc -type f \( -name \*.cmake -o -name CMakeLists.txt \) '!' -regex '.*src/other.*' '!' -regex '.*misc/tools.*' '!' -regex '.*misc/svn2git.*' '!' -regex '.*~' '!' -regex '.*cache.*' '!' -regex '.*\.svn.*' '!' -regex '.*autoheader.*'`
+ CMakeLists.txt"
+ 
+ 


Home | Main Index | Thread Index | Old Index