From c2195600b82ef3d452ccba5d5ea56b1663534d14 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 6 Feb 2014 01:31:19 +0100 Subject: [PATCH] Fix spurious failre with Pandas 0.13. * src/tgbatest/ltlcross4.test: Work around Pandas 0.13. * NEWS: Mention it. --- NEWS | 1 + src/tgbatest/ltlcross4.test | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index a1f0b45bc..ad369269e 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ New in spot 1.2.2a (not yet released) - randltl -S did not honor --boolean-priorities. - randltl had trouble generating formulas when all unary, or all binary/n-ary operators were disabled. + - Fix spurious testsuite failure when using Pandas 0.13. New in spot 1.2.2 (2014-01-24) diff --git a/src/tgbatest/ltlcross4.test b/src/tgbatest/ltlcross4.test index 8c092a945..b82127417 100755 --- a/src/tgbatest/ltlcross4.test +++ b/src/tgbatest/ltlcross4.test @@ -1,7 +1,7 @@ #!/bin/sh # -*- coding: utf-8 -*- -# Copyright (C) 2012, 2013 Laboratoire de Recherche et Développement -# de l'Epita (LRDE). +# Copyright (C) 2012, 2013, 2014 Laboratoire de Recherche et +# Développement de l'Epita (LRDE). # # This file is part of Spot, a model checking library. # @@ -51,8 +51,10 @@ EOF # will exit 77 if panda is not installed $PYTHON test.py >out.1 -# remove trailing whitespace from pandas' output -sed 's/[ \t]*$//g' py.out +# remove trailing whitespace from pandas' output, +# and limit to 26 lines, because Pandas 0.13 adds +# the size of the dataframe afterwards. +sed 's/[ \t]*$//g;26q' py.out cat >expected <