r45583 - in /packages/code-aster/aster/trunk/debian: README.Debian changelog config-mpi_32.txt config-mpi_64.txt config_32.txt config_64.txt rules
apalazzi-guest at users.alioth.debian.org
apalazzi-guest at users.alioth.debian.org
Sun Feb 17 18:58:09 UTC 2013
Author: apalazzi-guest
Date: Sun Feb 17 18:58:08 2013
New Revision: 45583
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45583
Log:
Added hardening flags and fixed postrm script.
Now postrm scripts removes all the symlink created by the
postinst script.
Modified:
packages/code-aster/aster/trunk/debian/README.Debian
packages/code-aster/aster/trunk/debian/changelog
packages/code-aster/aster/trunk/debian/config-mpi_32.txt
packages/code-aster/aster/trunk/debian/config-mpi_64.txt
packages/code-aster/aster/trunk/debian/config_32.txt
packages/code-aster/aster/trunk/debian/config_64.txt
packages/code-aster/aster/trunk/debian/rules
Modified: packages/code-aster/aster/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/README.Debian?rev=45583&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/README.Debian (original)
+++ packages/code-aster/aster/trunk/debian/README.Debian Sun Feb 17 18:58:08 2013
@@ -1,7 +1,9 @@
codeaster
---------
-The Code Aster binary has been built with _USE_MED_SHORT_INT
+The Code Aster binary has been built with _USE_MED_SHORT_INT;
+METIS, PETSC, ZMAT and HOMARD are not enabled or available
+in Debian, so the relative test cases will fail.
By default codeaster is using python2.7
To change the python version used, you simply have to make
@@ -12,4 +14,5 @@
To add the MPI version, append STA11.1_mpi to the lists of versions
in /etc/codeaster/aster :
-vers : STA10.3, STA10.3_mpi
+vers : STA11.3
+vers : STA11.3_MPI
Modified: packages/code-aster/aster/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/changelog?rev=45583&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/changelog (original)
+++ packages/code-aster/aster/trunk/debian/changelog Sun Feb 17 18:58:08 2013
@@ -1,3 +1,16 @@
+aster (11.3.0-2-2) unstable; urgency=low
+
+ * Add hardening flags
+ * Added support for openmp parallelism both in serial and in
+ parallel version
+ * Removed compile flags -fno-tree-dse (no longer necessary)
+ * Removed compile flag -fno-stack-protector because is
+ contrary to the hardening flag -fstack-protector
+ * Postrm scripts now removes all the symlink created by
+ postinst (Closes: #700537)
+
+ -- Andrea Palazzi <palazziandrea at yahoo.it> Sun, 17 Feb 2013 17:52:44 +0100
+
aster (11.3.0-2-1) unstable; urgency=low
* Package code-aster-test: fixed list of tests without homard
Modified: packages/code-aster/aster/trunk/debian/config-mpi_32.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi_32.txt?rev=45583&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_32.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_32.txt Sun Feb 17 18:58:08 2013
@@ -51,28 +51,28 @@
BIBL | c++ | ? | -lstdc++ -lsupc++
BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
#
-DEFS | defined | ? | LINUX _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI
+DEFS | defined | ? | LINUX _USE_OPENMP _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI
#
NOBUILD | option | ? |
#
PYTHON | python | 2.4 | /usr/bin/pythonPYVER
#
LINK | link | ? | /usr/bin/mpicc
-OPTL | link | ? | MPICC_LINK_FLAGS
+OPTL | link | ? | -fopenmp LDFLAGS MPICC_LINK_FLAGS
#
CC | cc | ? | /usr/bin/gcc
-OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC MPICC_COMPILE_FLAGS
-OPTC_O | cc | ? | -c -O2 -fno-tree-dse -fno-stack-protector -fPIC MPICC_COMPILE_FLAGS
+OPTC_D | cc | ? | -c -g -fopenmp -fPIC MPICC_COMPILE_FLAGS CPPFLAGS CFLAGS LDFLAGS
+OPTC_O | cc | ? | -c -O2 -fopenmp -fPIC MPICC_COMPILE_FLAGS CPPFLAGS CFLAGS LDFLAGS
INCL | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include -I/usr/include/mpi
#
F77 | f77 | ? | /usr/bin/gfortran
-OPTF_D | f77 | ? | -c -g -fPIC MPIF77_COMPILE_FLAGS
-OPTF_O | f77 | ? | -c -O2 -fno-tree-dse -fPIC MPIF77_COMPILE_FLAGS
+OPTF_D | f77 | ? | -c -g -fopenmp -fPIC MPIF77_COMPILE_FLAGS LDFLAGS
+OPTF_O | f77 | ? | -c -O2 -fopenmp -fPIC MPIF77_COMPILE_FLAGS LDFLAGS
INCLF | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include -I/usr/include/mpi
#
F90 | f90 | ? | /usr/bin/gfortran
-OPTF90_D | f90 | ? | -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC MPIF90_COMPILE_FLAGS
-OPTF90_O | f90 | ? | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC MPIF90_COMPILE_FLAGS
+OPTF90_D | f90 | ? | -c -g -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC MPIF90_COMPILE_FLAGS LDFLAGS
+OPTF90_O | f90 | ? | -c -O2 -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC MPIF90_COMPILE_FLAGS LDFLAGS
INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.10.0._mpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include -I/usr/include/mpi
#
G77_AGLA | g77 | ? | unused
Modified: packages/code-aster/aster/trunk/debian/config-mpi_64.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config-mpi_64.txt?rev=45583&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config-mpi_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config-mpi_64.txt Sun Feb 17 18:58:08 2013
@@ -51,28 +51,28 @@
BIBL | c++ | ? | -lstdc++ -lsupc++
BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm -L/usr/lib -lpthread -L/usr/lib -lz
#
-DEFS | defined | ? | LINUX64 _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI _USE_MED_SHORT_INT
+DEFS | defined | ? | LINUX64 _USE_OPENMP _USE_MPI _HAVE_MUMPS _USE_MPI_MUMPS _USE_MPI_FETI H5PART_HAS_MPI _USE_MED_SHORT_INT
#
NOBUILD | option | ? |
#
PYTHON | python | 2.4 | /usr/bin/pythonPYVER
#
LINK | link | ? | /usr/bin/gcc
-OPTL | link | ? | MPICC_LINK_FLAGS
+OPTL | link | ? | -fopenmp LDFLAGS MPICC_LINK_FLAGS
#
CC | cc | ? | /usr/bin/gcc
-OPTC_D | cc | ? | -v -c -g -fno-stack-protector -fPIC MPICC_COMPILE_FLAGS
-OPTC_O | cc | ? | -v -c -O2 -fno-tree-dse -fno-stack-protector -fPIC MPICC_COMPILE_FLAGS
+OPTC_D | cc | ? | -v -c -g -fopenmp -fPIC MPICC_COMPILE_FLAGS CPPFLAGS CFLAGS LDFLAGS
+OPTC_O | cc | ? | -v -c -O2 -fopenmp -fPIC MPICC_COMPILE_FLAGS CPPFLAGS CFLAGS LDFLAGS
INCL | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include -I/usr/include/mpi
#
F77 | f77 | ? | /usr/bin/gfortran
-OPTF_D | f77 | ? | -v -c -g -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF77_COMPILE_FLAGS
-OPTF_O | f77 | ? | -v -c -O2 -fno-tree-dse -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF77_COMPILE_FLAGS
+OPTF_D | f77 | ? | -v -c -g -fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF77_COMPILE_FLAGS LDFLAGS
+OPTF_O | f77 | ? | -v -c -O2 -fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF77_COMPILE_FLAGS LDFLAGS
INCLF | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include -I/usr/include/mpi
#
F90 | f90 | ? | /usr/bin/gfortran
-OPTF90_D | f90 | ? | -v -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF90_COMPILE_FLAGS
-OPTF90_O | f90 | ? | -v -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF90_COMPILE_FLAGS
+OPTF90_D | f90 | ? | -v -c -g -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF90_COMPILE_FLAGS LDFLAGS
+OPTF90_O | f90 | ? | -v -c -O2 -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 MPIF90_COMPILE_FLAGS LDFLAGS
INCLF90 | include | ? | -I/usr/include/openmpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.10.0_mpi -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include -I/usr/include/mpi
#
G77_AGLA | g77 | ? | unused
Modified: packages/code-aster/aster/trunk/debian/config_32.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config_32.txt?rev=45583&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config_32.txt (original)
+++ packages/code-aster/aster/trunk/debian/config_32.txt Sun Feb 17 18:58:08 2013
@@ -52,28 +52,28 @@
BIBL | c++ | ? | -lstdc++ -lsupc++
BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -L/usr/lib -ldl -L/usr/lib -lutil -L/usr/lib -lm -lpthread -lz
#
-DEFS | defined | ? | LINUX _HAVE_MUMPS H5_PART_HAS_MPI
+DEFS | defined | ? | LINUX _HAVE_MUMPS H5_PART_HAS_MPI _USE_OPENMP
#
NOBUILD | option | ? |
#
PYTHON | python | PYVER | /usr/bin/pythonPYVER
#
LINK | link | ? | /usr/bin/gfortran
-OPTL | link | ? | -fopenmp
+OPTL | link | ? | -fopenmp LDFLAGS
#
CC | cc | ? | /usr/bin/gcc
-OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC -fopenmp
-OPTC_O | cc | ? | -c -O2 -fno-tree-dse -fno-stack-protector -fopenmp
+OPTC_D | cc | ? | -c -g -fopenmp -fPIC CPPFLAGS CFLAGS LDFLAGS
+OPTC_O | cc | ? | -c -O2 -fopenmp CPPFLAGS CFLAGS LDFLAGS
INCL | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include/mpi
#
F77 | f77 | ? | /usr/bin/gfortran
-OPTF_D | f77 | ? | -c -g -fPIC -fopenmp
-OPTF_O | f77 | ? | -c -O2 -fno-tree-dse -fopenmp
+OPTF_D | f77 | ? | -c -g -fPIC -fopenmp LDFLAGS
+OPTF_O | f77 | ? | -c -O2 -fopenmp LDFLAGS
INCLF | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include/mpi
#
F90 | f90 | ? | /usr/bin/gfortran
-OPTF90_D | f90 | ? | -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC -fopenmp
-OPTF90_O | f90 | ? | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fopenmp
+OPTF90_D | f90 | ? | -c -g -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC LDFLAGS
+OPTF90_O | f90 | ? | -c -O2 -fopenmp -ffixed-line-length-0 -x f77-cpp-input LDFLAGS
INCLF90 | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.10.0 -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include/mpi
#
G77_AGLA | g77 | ? | unused
Modified: packages/code-aster/aster/trunk/debian/config_64.txt
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/config_64.txt?rev=45583&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/config_64.txt (original)
+++ packages/code-aster/aster/trunk/debian/config_64.txt Sun Feb 17 18:58:08 2013
@@ -51,7 +51,7 @@
BIBL | mpi | 2 |
BIBL | c++ | ? | -lstdc++ -lsupc++
BIBL | sys | ? | -Wl,--allow-multiple-definition -Wl,--export-dynamic -L/usr/lib -ldl -L/usr/lib -lutil -L/usr/lib -lm -lpthread -lz
-DEFS | defined | ? | LINUX64 _HAVE_MUMPS H5_PART_HAS_MPI _USE_MED_SHORT_INT
+DEFS | defined | ? | LINUX64 _USE_OPENMP _HAVE_MUMPS H5_PART_HAS_MPI _USE_MED_SHORT_INT
#
#
NOBUILD | option | ? |
@@ -59,21 +59,21 @@
PYTHON | python | PYVER | /usr/bin/pythonPYVER
#
LINK | link | ? | /usr/bin/gfortran
-OPTL | link | ? | -fopenmp
+OPTL | link | ? | -fopenmp LDFLAGS
#
CC | cc | ? | /usr/bin/gcc
-OPTC_D | cc | ? | -c -g -fno-stack-protector -fPIC -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTC_O | cc | ? | -c -O2 -fno-tree-dse -fno-stack-protector -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTC_D | cc | ? | -c -g -fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 CPPFLAGS CFLAGS LDFLAGS
+OPTC_O | cc | ? | -c -O2 -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 CPPFLAGS CFLAGS LDFLAGS
INCL | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibc/include -I/usr/include/pythonPYVER -I/usr/lib/pymodules/pythonPYVER/numpy/core/include -I/usr/include/scotch -I/usr/include/mpi
#
F77 | f77 | ? | /usr/bin/gfortran
-OPTF_D | f77 | ? | -c -g -fPIC -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF_O | f77 | ? | -c -O2 -fno-tree-dse -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTF_D | f77 | ? | -c -g -fopenmp -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 LDFLAGS
+OPTF_O | f77 | ? | -c -O2 -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 LDFLAGS
INCLF | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include/mpi
#
F90 | f90 | ? | /usr/bin/gfortran
-OPTF90_D | f90 | ? | -c -g -ffixed-line-length-0 -x f77-cpp-input -fPIC -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
-OPTF90_O | f90 | ? | -c -O2 -fno-tree-dse -ffixed-line-length-0 -x f77-cpp-input -fopenmp -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8
+OPTF90_D | f90 | ? | -c -g -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fPIC -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 LDFLAGS
+OPTF90_O | f90 | ? | -c -O2 -fopenmp -ffixed-line-length-0 -x f77-cpp-input -fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 LDFLAGS
INCLF90 | include | ? | -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibf90/include_mumps-4.10.0 -IDEB_DESTDIR/ASTER_ROOT/STA_VERSION/bibfor/include -I/usr/include/mpi
#
G77_AGLA | g77 | ? | unused
Modified: packages/code-aster/aster/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=45583&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Sun Feb 17 18:58:08 2013
@@ -14,6 +14,12 @@
MPIF77_COMPILE_FLAGS ?= $(shell mpif77 --showme:compile)
MPIF90_COMPILE_FLAGS ?= $(shell mpif90 --showme:compile)
MPICC_LINK_FLAGS ?= $(shell mpicc --showme:link)
+
+# hardening flags
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
STA_UPSTREAM_VERSION=STA11.3
STA_VERSION=STABLE
@@ -64,6 +70,10 @@
perl -pi -e "s|PYVER|$$v|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|DEB_DESTDIR|$(DEB_DESTDIR)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|ASTER_ROOT|$(ASTER_ROOT)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|CPPFLAGS|$(CPPFLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|CFLAGS|$(CFLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|CXXFLAGS|$(CXXFLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|LDFLAGS|$(LDFLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make --vers=$(STA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
find $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION) -name \*.o | xargs rm; \
perl -pi -e "s|$(DEB_DESTDIR)||g" $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/config-py$$v.txt; \
@@ -102,6 +112,10 @@
perl -pi -e "s|MPIF77_COMPILE_FLAGS|$(MPIF77_COMPILE_FLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|MPIF90_COMPILE_FLAGS|$(MPIF90_COMPILE_FLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
perl -pi -e "s|MPICC_LINK_FLAGS|$(MPICC_LINK_FLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|CPPFLAGS|$(CPPFLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|CFLAGS|$(CFLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|CXXFLAGS|$(CXXFLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
+ perl -pi -e "s|LDFLAGS|$(LDFLAGS)|g" $(DEB_DESTDIR)$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make clean --vers=$(PTA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/dtag; \
python$$v -c 'import sys, asrun ; from asrun.main import main,start; del sys.argv[0]; main()' /usr/bin/as_run --make --vers=$(PTA_VERSION) --destdir=$(DEB_DESTDIR) --config=$(DEB_DESTDIR)/$(ASTER_ROOT)/$(PTA_VERSION)/config-py$$v.txt; \
@@ -121,14 +135,15 @@
# Export file replacements for running tests
sed -i 's:?ASTER_ROOT?:$(ASTER_SHARE_DIR):' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
sed -i 's:?ASTER_VERSION?:$(STA_VERSION):' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
-# Create liste_short_without_homard
- cat $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_short | grep -v -f debian/liste_homard > $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_short_without_homard
-# Create liste_without_homard
- cat $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_internet | grep -v -f debian/liste_homard > $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_internet_without_homard
-# Use the short test list without homard by default
+
+# remove the tests failing because of missing features from liste_short
+ cat $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_short | grep -v -f debian/liste_missing_debian > $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_short_debian
+# remove the tests failing because of missing features from liste_internet
+ cat $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_internet | grep -v -f debian/liste_missing_debian > $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_internet_debian
+# Use the short test list without failing cases by default
sed -i '/liste_internet/ s/^/#/' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
sed -i 's:#\(.*liste_short.*\):#\1\n\1:' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
- sed -i '/^F/ s:liste_short:&_without_homard:' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
+ sed -i '/^F/ s:liste_short:&_debian:' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
# Results will be in /tmp for writing permission
sed -i '/resu_test/ s:$(ASTER_SHARE_DIR)/$(STA_VERSION):/tmp:' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
More information about the debian-science-commits
mailing list