[SCM] Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software. branch, master, updated. upstream/1.5.2-51-g9f43e4a

Anton Gladky gladky.anton at gmail.com
Thu Mar 15 19:06:27 UTC 2012


The following commit has been merged in the master branch:
commit e5a0fb3eae767d5dbab16fde244ab2952c0ab888
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Mar 15 20:04:52 2012 +0100

    Disable mpirun-test on some platforms, where it crashes.

diff --git a/debian/rules b/debian/rules
index 5d38bbd..dbac0bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,8 @@
 
 export OMPI_MCA_plm_rsh_agent=/bin/false		#workaround to start MPI-applications in chroot
 
-disable_auto_test_archs = armel armhf
+disable_auto_test_archs_simple = armel armhf 
+disable_auto_test_archs_mpi = hurd-i386 mips mipsel s390 s390x
 
 override_dh_auto_clean:
 	cd src; make clean-all
@@ -16,11 +17,13 @@ override_dh_auto_build:
 	mv src/lmp_fedora src/liggghts
 
 override_dh_auto_test:
-ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs)))
+ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_simple)))
 	mkdir test
 	cp -r examples/LIGGGHTS/chute_wear/* test/
 	cd test; ./../src/liggghts < in.chute_wear || true
 	rm -rf test
+endif
+ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_mpi)))
 	mkdir test
 	cp -r examples/LIGGGHTS/chute_wear/* test/
 	cd test; mpirun -np 2 ./../src/liggghts < in.chute_wear || true

-- 
Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software.



More information about the debian-science-commits mailing list