build: fold test makefile into primary makefile

Moving the subdir makefile into the main one lets us more easily track
dependencies for reliable builds. Previously we tended to build against
old versions of the static library when running the tests.
This commit is contained in:
Danny Robson 2015-02-13 18:02:09 +11:00
parent ecc40f2315
commit 166b97e0c5

View File

@ -199,6 +199,22 @@
} while (0) } while (0)
///////////////////////////////////////////////////////////////////////////////
#define CHECK_ZERO(A) do { \
DEBUG_ONLY( \
const auto __a = (A); \
_CHECK_META (almost_zero (__a), \
{ ; }, \
{ \
std::ostringstream __debug_nez_os; \
__debug_nez_os << "expected zero.\n" \
<< "__a: " << #A << " is " << __a << ")"; \
panic (__debug_nez_os.str ()); \
}); \
); \
} while (0)
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define CHECK_NEZ(A) do { \ #define CHECK_NEZ(A) do { \
DEBUG_ONLY( \ DEBUG_ONLY( \
@ -215,7 +231,6 @@
} while (0) } while (0)
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define CHECK_THROWS(E,C) do { \ #define CHECK_THROWS(E,C) do { \
DEBUG_ONLY( \ DEBUG_ONLY( \