diff options
| author | Tor Didriksen <tor.didriksen@sun.com> | 2010-06-10 13:21:35 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@sun.com> | 2010-06-10 13:21:35 +0200 |
| commit | ce5927dc8943368395cb770639995cc609975b62 (patch) | |
| tree | c5eea40caa24595e89d2a08ff0182c08184189b2 /unittest/examples | |
| parent | 3b3de28816513e97415922bff9230ce5b7982cb5 (diff) | |
| parent | a24df71e95fb6379a3ba86322c9941a82b8d6527 (diff) | |
| download | mariadb-git-ce5927dc8943368395cb770639995cc609975b62.tar.gz | |
Merge fix for Bug#53303 from 5.1-bugteam
text conflict: unittest/examples/Makefile.am
Diffstat (limited to 'unittest/examples')
| -rw-r--r-- | unittest/examples/Makefile.am | 3 | ||||
| -rw-r--r-- | unittest/examples/no_plan-t.c | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/unittest/examples/Makefile.am b/unittest/examples/Makefile.am index cfb22e678d4..3e64c7ceddc 100644 --- a/unittest/examples/Makefile.am +++ b/unittest/examples/Makefile.am @@ -20,4 +20,5 @@ AM_LDFLAGS = -L$(top_builddir)/unittest/mytap LDADD = -lmytap -noinst_PROGRAMS = simple-t skip-t todo-t skip_all-t no_plan-t core-t +# We omit core-t here, since it will always fail. +noinst_PROGRAMS = simple-t skip-t todo-t skip_all-t no_plan-t diff --git a/unittest/examples/no_plan-t.c b/unittest/examples/no_plan-t.c index 06378e81218..9aeb5c7666a 100644 --- a/unittest/examples/no_plan-t.c +++ b/unittest/examples/no_plan-t.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 MySQL AB +/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,14 +20,19 @@ /* Sometimes, the number of tests is not known beforehand. In those - cases, the plan can be omitted and will instead be written at the - end of the test (inside exit_status()). + cases, you should invoke plan(NO_PLAN). + The plan will be printed at the end of the test (inside exit_status()). Use this sparingly, it is a last resort: planning how many tests you are going to run will help you catch that offending case when some tests are skipped for an unknown reason. */ int main() { + /* + We recommend calling plan(NO_PLAN), but want to verify that + omitting the call works as well. + plan(NO_PLAN); + */ ok(1, " "); ok(1, " "); ok(1, " "); |