On Mon, Jun 22, 2015 at 01:54:16PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > From: Niklas Hambuechen <[email protected]> > > This renames the deprecated `printTestCase` to its replacement > `counterexample`, add provides a CPP-guarded fallback for QuickCheck < 2.7. > > Signed-off-by: Niklas Hambuechen <[email protected]> > Reviewed-by: Klaus Aehlig <[email protected]> > > Conflicts: > test/hs/Test/Ganeti/JQScheduler.hs > - removed file not present in 2.12 > test/hs/Test/Ganeti/SlotMap.hs > - removed file not present in 2.12 > test/hs/Test/Ganeti/TestCommon.hs > - added definition for MIN_VERSION_QuickCheck; needs to be > removed when merging to 2.14 > test/hs/Test/Ganeti/Utils/Statistics.hs > - added qualified imports to pull counterexample from > TestCommon > > Cherry-picked-from: 077c415a09f8c381ce788ebe6c065d8ccab60564 > Signed-off-by: Petr Pudlak <[email protected]> > --- > Makefile.am | 7 ++ > doc/dev-codestyle.rst | 6 +- > test/hs/Test/Ganeti/BasicTypes.hs | 10 +-- > test/hs/Test/Ganeti/Confd/Utils.hs | 8 +- > test/hs/Test/Ganeti/HTools/Backend/Text.hs | 8 +- > test/hs/Test/Ganeti/HTools/Cluster.hs | 14 ++-- > test/hs/Test/Ganeti/HTools/Container.hs | 2 +- > test/hs/Test/Ganeti/HTools/Node.hs | 2 +- > test/hs/Test/Ganeti/HTools/Types.hs | 2 +- > test/hs/Test/Ganeti/Hypervisor/Xen/XmParser.hs | 4 +- > test/hs/Test/Ganeti/JQueue.hs | 28 +++---- > test/hs/Test/Ganeti/Locking/Allocation.hs | 30 +++---- > test/hs/Test/Ganeti/Locking/Locks.hs | 4 +- > test/hs/Test/Ganeti/Locking/Waiting.hs | 46 +++++------ > test/hs/Test/Ganeti/Network.hs | 10 +-- > test/hs/Test/Ganeti/Objects.hs | 6 +- > test/hs/Test/Ganeti/OpCodes.hs | 2 +- > test/hs/Test/Ganeti/Query/Filter.hs | 8 +- > test/hs/Test/Ganeti/Query/Language.hs | 2 +- > test/hs/Test/Ganeti/Query/Query.hs | 104 > ++++++++++++------------- > test/hs/Test/Ganeti/Ssconf.hs | 2 +- > test/hs/Test/Ganeti/TestCommon.hs | 29 ++++++- > test/hs/Test/Ganeti/Utils.hs | 54 ++++++------- > test/hs/Test/Ganeti/Utils/MultiMap.hs | 4 +- > test/hs/Test/Ganeti/Utils/Statistics.hs | 5 +- > 25 files changed, 214 insertions(+), 183 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 29c06d8..c9fd066 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -1211,6 +1211,13 @@ hs-pkg-versions: > -DMONAD_CONTROL_MAJOR=\1 -DMONAD_CONTROL_MINOR=\2 > -DMONAD_CONTROL_REV=\3/'\ > -e 's/^\s*//' \ > >> $@ > + ghc-pkg list --simple-output QuickCheck \ > + | sed -r -e '$$!d' \ > + -e 's/^QuickCheck-([0-9]+(\.[0-9]+)*)/\1 0 0 0/' \ > + -e 's/\./ /g' -e 's/([0-9]+) *([0-9]+) *([0-9]+) .*/\ > + -DQUICKCHECK_MAJOR=\1 -DQUICKCHECK_MINOR=\2 -DQUICKCHECK_REV=\3/'\ > + -e 's/^\s*//' \ > + >> $@
NACK. This is not a cherry pick, as patch 077c415a09f8c381ce788ebe6c065d8ccab60564 does not touch the Makefile.am If you need that change to the Makefile.am cherry-pick the patch that introduced the change there. Same for the other changes not part of the cherry-picked patch. -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
