summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--unittest/mytap/Doxyfile48
-rw-r--r--unittest/mytap/tap.h14
2 files changed, 34 insertions, 28 deletions
diff --git a/unittest/mytap/Doxyfile b/unittest/mytap/Doxyfile
index 8b6bf7556df..8c23703e925 100644
--- a/unittest/mytap/Doxyfile
+++ b/unittest/mytap/Doxyfile
@@ -412,42 +412,44 @@ WARN_LOGFILE =
# configuration options related to the input files
#---------------------------------------------------------------------------
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
+# The INPUT tag can be used to specify the files and/or directories
+# that contain documented source files. You may enter file names like
+# "myfile.cpp" or directories like "/usr/src/myproject". Separate the
+# files or directories with spaces.
INPUT =
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like
+# *.cpp and *.h) to filter out the source-files in the directories. If
+# left blank the following patterns are tested: *.c *.cc *.cxx *.cpp
+# *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp *.h++
+# *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
FILE_PATTERNS =
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
+# The RECURSIVE tag can be used to turn specify whether or not
+# subdirectories should be searched for input files as well. Possible
+# values are YES and NO. If left blank NO is used.
-RECURSIVE = NO
+RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# The EXCLUDE tag can be used to specify files and/or directories that
+# should excluded from the INPUT source files. This way you can easily
+# exclude a subdirectory from a directory tree whose root is specified
+# with the INPUT tag.
EXCLUDE =
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are
+# excluded from the input.
EXCLUDE_SYMLINKS = NO
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to
+# exclude certain files from those directories.
EXCLUDE_PATTERNS =
@@ -918,7 +920,7 @@ ENABLE_PREPROCESSING = YES
# compilation will be performed. Macro expansion can be done in a controlled
# way by setting EXPAND_ONLY_PREDEF to YES.
-MACRO_EXPANSION = NO
+MACRO_EXPANSION = YES
# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
# then the macro expansion is limited to the macros specified with the
diff --git a/unittest/mytap/tap.h b/unittest/mytap/tap.h
index bfd7764ce17..53023e83028 100644
--- a/unittest/mytap/tap.h
+++ b/unittest/mytap/tap.h
@@ -21,6 +21,10 @@
#ifndef TAP_H
#define TAP_H
+#ifndef __GNUC__
+#define __attribute__(F)
+#endif
+
/*
@defgroup MyTAP MySQL support for performing unit tests according to TAP.
@@ -86,7 +90,7 @@ void plan(int count);
which case nothing is printed.
*/
void ok(int pass, char const *fmt, ...)
- __attribute__ ((format(printf,2,3)));
+ __attribute__((format(printf,2,3)));
/**
Skip a determined number of tests.
@@ -113,7 +117,7 @@ void ok(int pass, char const *fmt, ...)
@param reason A reason for skipping the tests
*/
void skip(int how_many, char const *reason, ...)
- __attribute__ ((format(printf,2,3)));
+ __attribute__((format(printf,2,3)));
/**
@@ -142,7 +146,7 @@ void skip(int how_many, char const *reason, ...)
@param fmt Diagnostics message in printf() format.
*/
void diag(char const *fmt, ...)
- __attribute__ ((format(printf,1,2)));
+ __attribute__((format(printf,1,2)));
/**
Print summary report and return exit status.
@@ -170,7 +174,7 @@ int exit_status(void);
around it.
*/
void skip_all(char const *reason, ...)
- __attribute__ ((noreturn, format(printf, 1, 2)));
+ __attribute__((noreturn, format(printf, 1, 2)));
/**
Start section of tests that are not yet ready.
@@ -193,7 +197,7 @@ void skip_all(char const *reason, ...)
@param message Message that will be printed before the todo tests.
*/
void todo_start(char const *message, ...)
- __attribute__ ((format (printf, 1, 2)));
+ __attribute__((format (printf, 1, 2)));
/**
End a section of tests that are not yet ready.