yay! Looks good to me assuming make distcheck passes. I wonder if there would be a reason to optionally disable it with configure somehow. That way we could avoid running the tests in parallel in the builds in case they trample on each other. That may be overly cautious though. At any rate I don't think something like that needs to go into this patch.
Ethan On Mon, Mar 14, 2011 at 3:16 PM, Ben Pfaff <[email protected]> wrote: > Passing e.g. -j4 in TESTSUITEFLAGS runs 4 tests in parallel, which speeds > up the testsuite. > --- > debian/rules | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/debian/rules b/debian/rules > index bbc7357..de79800 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -14,9 +14,11 @@ > BUILD_NUMBER = 0 > > ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) > -NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) > -MAKEFLAGS += -j$(NUMJOBS) > +PARALLEL = -j$(patsubst parallel=%,%,$(filter > parallel=%,$(DEB_BUILD_OPTIONS))) > +else > +PARALLEL = > endif > +MAKEFLAGS += $(PARALLEL) > > ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) > CFLAGS += -O0 > @@ -45,7 +47,8 @@ build-arch: build-arch-stamp > build-arch-stamp: configure-stamp > $(MAKE) -C _debian > ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) > - if $(MAKE) -C _debian check; then :; else \ > + if $(MAKE) -C _debian check > TESTSUITEFLAGS='$(PARALLEL)'; then :; \ > + else \ > cat > _debian/tests/testsuite.log; \ > exit 1; \ > fi > -- > 1.7.1 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
