[lmi-commits] [5129] Resolve unit-test build issues with an ancient compiler

[Greg Chicares]

Revision: 5129
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5129
Author:   chicares
Date:     2010-12-17 01:11:46 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Resolve unit-test build issues with an ancient compiler

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/bcc_5_5_1.make
    lmi/trunk/name_value_pairs_test.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-12-16 12:59:45 UTC (rev 5128)
+++ lmi/trunk/ChangeLog 2010-12-17 01:11:46 UTC (rev 5129)
@@ -27059,3 +27059,9 @@
   yare_input.hpp
 Improve class uncopyable.
 
+20101217T0111Z <address@hidden> [656]
+
+  bcc_5_5_1.make
+  name_value_pairs_test.cpp
+Resolve unit-test build issues with an ancient compiler.
+

Modified: lmi/trunk/bcc_5_5_1.make
===================================================================
--- lmi/trunk/bcc_5_5_1.make    2010-12-16 12:59:45 UTC (rev 5128)
+++ lmi/trunk/bcc_5_5_1.make    2010-12-17 01:11:46 UTC (rev 5129)
@@ -130,6 +130,11 @@
 
 platform_wx_libraries :=
 
+# The borland compiler can't handle the boost filesystem code, but it
+# can limp through some tests by pretending that code doesn't exist.
+
+boost_filesystem_objects :=
+
 # The borland compiler rejects some conforming code, generating many
 # spurious and distracting diagnostics; it fails utterly to build
 # these tests:
@@ -138,6 +143,7 @@
   actuarial_table_test \
   authenticity_test \
   commutation_functions_test \
+  configurable_settings_test \
   global_settings_test \
   input_test \
   irc7702a_test \
@@ -222,12 +228,17 @@
   cwchar     \
   cwctype    \
 
-# This dummy target prevents this makefile from being the default
-# target. It mustn't be PHONY.
-all:
+MAKECMDGOALS ?= unit_tests
 
+# Default target.
+$(MAKECMDGOALS):
+
 bcc_5_5_1.make:: ;
 
+# Use '--jobs=1' to prevent 'make' parallelism, which appears to be
+# incompatible with borland C++. Ignore any "disabling jobserver mode"
+# warning that this engenders.
+
 %: force
        address@hidden -d $(shadow_header_directory) ] || mkdir 
$(shadow_header_directory)
        @touch \
@@ -236,7 +247,8 @@
            $(cxx_library_headers) $(cxx_c_library_headers) \
            )
        @-$(MAKE) \
-         -f $(src_dir)/GNUmakefile \
+         --file=$(src_dir)/GNUmakefile \
+         --jobs=1 \
                                    src_dir='$(src_dir)' \
                                    toolset='$(toolset)' \
                                gcc_version='$(gcc_version)' \
@@ -254,12 +266,13 @@
                                    LDFLAGS='$(LDFLAGS)' \
                               MPATROL_LIBS='$(MPATROL_LIBS)' \
                      platform_wx_libraries='$(platform_wx_libraries)' \
+                  boost_filesystem_objects='$(boost_filesystem_objects)' \
                 excluded_unit_test_targets='$(excluded_unit_test_targets)' \
                                    GNU_CPP='$(GNU_CPP)' \
                                    GNU_CXX='$(GNU_CXX)' \
                           MAKEDEPEND_FLAGS='$(MAKEDEPEND_FLAGS)' \
                         MAKEDEPEND_COMMAND='$(MAKEDEPEND_COMMAND)' \
-         unit_tests \
+         $(MAKECMDGOALS); \
 
 force: ;
 

Modified: lmi/trunk/name_value_pairs_test.cpp
===================================================================
--- lmi/trunk/name_value_pairs_test.cpp 2010-12-16 12:59:45 UTC (rev 5128)
+++ lmi/trunk/name_value_pairs_test.cpp 2010-12-17 01:11:46 UTC (rev 5129)
@@ -31,16 +31,20 @@
 #include "miscellany.hpp"
 #include "test_tools.hpp"
 
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
+#if !defined __BORLANDC__
+#   include <boost/filesystem/operations.hpp>
+#   include <boost/filesystem/path.hpp>
+#endif // !defined __BORLANDC__
 
 #include <cstdio> // std::remove()
 #include <fstream>
 
 int test_main(int, char*[])
 {
+#if !defined __BORLANDC__
     fs::path const tmpdir(fs::complete("/tmp"));
     fs::create_directory(tmpdir);
+#endif // !defined __BORLANDC__
 
     std::string filename0("/tmp/eraseme");