On 15.09.2015 08:11, Fam Zheng wrote: > From: Stefan Hajnoczi <stefa...@redhat.com> > > The BlockJobTxn unit test verifies that both single jobs and pairs of > jobs behave as a transaction group. Either all jobs complete > successfully or the group is cancelled. > > Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> > Signed-off-by: Fam Zheng <f...@redhat.com> > Reviewed-by: Max Reitz <mre...@redhat.com> > --- > tests/Makefile | 3 + > tests/test-blockjob-txn.c | 244 > ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 247 insertions(+) > create mode 100644 tests/test-blockjob-txn.c > > diff --git a/tests/Makefile b/tests/Makefile > index 34c6136..89ce2f3 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -45,6 +45,8 @@ check-unit-y += tests/test-thread-pool$(EXESUF) > gcov-files-test-thread-pool-y = thread-pool.c > gcov-files-test-hbitmap-y = util/hbitmap.c > check-unit-y += tests/test-hbitmap$(EXESUF) > +gcov-files-test-hbitmap-y = blockjob.c > +check-unit-y += tests/test-blockjob-txn$(EXESUF) > check-unit-y += tests/test-x86-cpuid$(EXESUF) > # all code tested by test-x86-cpuid is inside topology.h > gcov-files-test-x86-cpuid-y = > @@ -294,6 +296,7 @@ tests/test-coroutine$(EXESUF): tests/test-coroutine.o > $(block-obj-y) libqemuutil > tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a > libqemustub.a > tests/test-rfifolock$(EXESUF): tests/test-rfifolock.o libqemuutil.a > libqemustub.a > tests/test-throttle$(EXESUF): tests/test-throttle.o $(block-obj-y) > libqemuutil.a libqemustub.a > +tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(block-obj-y) > libqemuutil.a libqemustub.a > tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(block-obj-y) > libqemuutil.a libqemustub.a > tests/test-iov$(EXESUF): tests/test-iov.o libqemuutil.a > tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o libqemuutil.a libqemustub.a
This needs an update due to b124533e. The context is obvious, and I guess for the new line itself it's s/\$(block-obj-y).*$/$(test-block-obj-y)/. If that is indeed so, feel free to keep my R-b. Max
signature.asc
Description: OpenPGP digital signature