[Pkg-ocaml-maint-commits] [why] 01/01: test frama-c+why+alt-ergo: does not need cpp-4.7 any longer

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository why.

commit 491e586752c619f4a88e89c7fd2633c470c1c9ad
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Apr 29 08:50:58 2014 +0200

    test frama-c+why+alt-ergo: does not need cpp-4.7 any longer
---
 debian/changelog                     | 10 ++++++----
 debian/tests/control                 |  2 +-
 debian/tests/frama-c+jessie+alt-ergo |  6 +-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 241bf8a..9f0688f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,12 @@ why (2.34-1) UNRELEASED; urgency=low
     - hashtbl
     - frama-c-versions
   * Bump build-dependency on frama-c to version 20140301+neon+dfsg.
-  * Fix debian/tests/frama-c+jessie+alt-ergo: run why-config when there is
-    no ${HOME}/.whyrc
-
- -- Ralf Treinen <treinen at debian.org>  Mon, 28 Apr 2014 21:06:08 +0200
+  * Fix debian/tests/frama-c+jessie+alt-ergo:
+    - run why-config when there is no ${HOME}/.whyrc
+    - drop the specification of cpp-4.7 as this is no longer needed, and
+      the dependency of that test on cpp-4.7
+  
+ -- Ralf Treinen <treinen at debian.org>  Tue, 29 Apr 2014 08:51:38 +0200
 
 why (2.33-2) unstable; urgency=low
 
diff --git a/debian/tests/control b/debian/tests/control
index 511db22..1a3e116 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -11,5 +11,5 @@ Depends: @, coq
 Restrictions: allow-stderr
 
 Tests: frama-c+jessie+alt-ergo
-Depends: @, frama-c-base, cpp-4.7, alt-ergo
+Depends: @, frama-c-base, alt-ergo
 Restrictions: allow-stderr
diff --git a/debian/tests/frama-c+jessie+alt-ergo b/debian/tests/frama-c+jessie+alt-ergo
index 27a60fc..92722e0 100755
--- a/debian/tests/frama-c+jessie+alt-ergo
+++ b/debian/tests/frama-c+jessie+alt-ergo
@@ -18,13 +18,9 @@ do
     framacoutfile=${base%.c}.frc
     echo "Testing frama-c + jessie + alt-ergo on $base" >&2
     successpattern="why/${base%.c}_why.why           : .. (2/0/0/0/0)"
-    frama-c -jessie -jessie-atp=alt-ergo \
-	-cpp-command 'cpp-4.7 -C -E -I.' ${base} > ${framacoutfile}
+    frama-c -jessie -jessie-atp=alt-ergo ${base} > ${framacoutfile}
     if ! $(grep -q "${successpattern}" ${framacoutfile}); then
     	cat ${framacoutfile}
     	exit 1
     fi
 done
-
-# we have to use cpp-4.7, see
-# http://lists.gforge.inria.fr/pipermail/frama-c-discuss/2013-November/004057.html
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/why.git