blob: 89204618ef4e792a666a4ffc34987702334785f9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
--- misc/build/cppunit-1.12.1/configure
+++ misc/build/cppunit-1.12.1/configure
@@ -23273,7 +23273,7 @@
{ echo "$as_me:$LINENO: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
echo "${ECHO_T}creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6; }
if test -f $ac_prefix_conf_INP ; then
- $as_dirname -- /* automatically generated */ ||
+ $as_dirname -- '/* automatically generated */' ||
$as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X/* automatically generated */ : 'X\(//\)[^/]' \| \
X/* automatically generated */ : 'X\(//\)$' \| \
@@ -23318,5 +23318,5 @@
echo "$as_me: error: input file $ac_prefix_conf_IN does not exist, skip generating $ac_prefix_conf_OUT" >&2;}
{ (exit 1); exit 1; }; }
fi
- rm -f conftest.*
+ rm -f -r conftest.*
fi
--- misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h
+++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h
@@ -106,7 +106,9 @@
* CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
* \endcode
*/
+#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME
#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
+#endif
/*! \brief Type of the function exported by a plug-in.
* \ingroup WritingTestPlugIn
@@ -143,6 +143,12 @@
#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
typedef char __CppUnitPlugInImplementMainDummyTypeDef
+// Actually this is for iOS where we build the cppunit tests libraries
+// as plain archives and just link them statically into test fixture programs,
+// and don't want any stinking duplicate main(), but shouldn't hurt for MacOSX either.
+#elif defined(__APPLE__)
+#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
+ typedef char __CppUnitPlugInImplementMainDummyTypeDef
// Unix
#elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
|
