[SCM] LAMMPS Molecular Dynamics Simulator branch, master, updated. upstream/0_20120305.git5d7feb1-28-gcf6ee1b

[Anton Gladky]

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

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

diff --git a/debian/rules b/debian/rules
index 4293056..3769191 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
 
+disable_auto_test_archs_mpi = hurd-i386 mips mipsel s390 s390x
+
 %:
 	dh $@ --parallel
 
@@ -16,8 +18,10 @@ override_dh_auto_build:
 
 override_dh_auto_test:
 	mkdir test; cp examples/crack/* test/
-	cd test; ./../src/lammps < in.crack || true
+	cd test; ./../src/lammps < in.crack
 	rm -rf test
+ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_mpi)))
 	mkdir test; cp examples/crack/* test/
-	cd test; mpirun -np 2 ./../src/lammps < in.crack || true
+	cd test; mpirun -np 2 ./../src/lammps < in.crack
 	rm -rf test
+endif

-- 
LAMMPS Molecular Dynamics Simulator