Adding Borland C++ Builder 5 support. #137

dvader · 2016-11-18T22:31:01Z

Included the project files as well as the automatically generated makefiles. There is probably a better organization for all those files. Also CMake might be able to handle BCB5. I need help in this matter.
The library compiles without issues.
Borland requires the UnitTest namespace to be defined at the beginning of tests.
Added an default to have no support for C++11.
Added a Borland to the list of compilers that don't recognize "long long" but use __int64 instead.

Included the project files as well as the automatically generated makefiles. The library compiles without issues. Borland requires the UnitTest namespace to be defined at the beginning of tests. Added an default to have no support for C++11. Added a Borland to the list of compilers that don't recognize "long long" but use __int64 instead.

grahamreeds · 2016-11-19T14:26:36Z

Hmm. Have you tested this on gcc and msvc? I am not a fan of using namespace.

Sent from my Nexus 6P

On 18 Nov 2016 10:31 pm, "dvader" notifications@github.com wrote:

Included the project files as well as the automatically generated
makefiles. There is probably a better organization for all those files.
Also CMake might be able to handle BCB5. I need help in this matter.
The library compiles without issues.
Borland requires the UnitTest namespace to be defined at the beginning of
tests.
Added an default to have no support for C++11.
Added a Borland to the list of compilers that don't recognize "long long"

but use __int64 instead.

You can view, comment on, or merge this pull request online at:

#137
Commit Summary

Adding Borland C++ Builder 5 support.

File Changes

A UnitTestcpp.bpg
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-0
(25)
A UnitTestcppLib.bpf
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-1
(30)
A UnitTestcppLib.bpr
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-2
(95)
A UnitTestcppLib.mak
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-3
(197)
A UnitTestcppTest.bpf
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-4
(27)
A UnitTestcppTest.bpr
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-5
(102)
A UnitTestcppTest.mak
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-6
(196)
M tests/Main.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-7 (3)
M tests/TestCheckMacros.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-8 (1)
M tests/TestCurrentTest.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-9 (2)
M tests/TestExceptions.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-10
(1)
M tests/TestLongMacros.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-11
(2)
M tests/TestMemoryOutStream.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-12
(6)
M tests/TestRequireMacrosWithExceptionsOn.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-13
(1)
M tests/TestTestMacros.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-14
(3)
M tests/TestTestSuite.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-15
(2)
M tests/TestTimeConstraintMacro.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-16
(2)
M tests/TestUnitTestPP.cpp
https://github.com/unittest-cpp/unittest-cpp/pull/137/files#diff-17
(1)

Patch Links:

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#137, or mute the thread
https://github.com/notifications/unsubscribe-auth/AEy9nD0cKBkHCvzlZo-XLfXfvZE14MwFks5q_icmgaJpZM4K2_n6
.

dvader · 2016-11-20T05:56:43Z

The build passed for gcc, clang and msvc including all the unit tests. I've added some using namespace but there were some already.

…commendation.

dvader · 2016-11-20T16:17:01Z

I have added some conditional compiles around the using namespace UnitTest as the tests don't compile with the Borland compiler without them.
The using namespace are only in the unit test files and none in the actual library as the library compiles cleanly without them.

cd builds cmake -G"Borland Makefiles" .. make Two of the tests fail because of unhandled floating point exceptions (throws when doing calculations using Nan). This was fixed by ignoring floating point exceptions. One test fails because std::string is not implemented properly in Borland C++ 5. This test is bypassed if using the Borland compiler. It does mean though that MemoryOutStream.Clear() doesn't work. A more permanent fix might be needed. I noticed a separate implementation of MemoryOutStream for VC6 that doesn't use std::string. Maybe we can use that one instead.

…tring from an ostrstream (MemoryOutStream GetString would throw if the stream was empty). Moving the exception disable to the test file instead of the main file so the workaround is located where it is needed. All tests pass!!!

dvader · 2016-11-29T20:33:27Z

@pjohnmeyer @grahamreeds any comments or suggestions?

pjohnmeyer

Thanks again for the PR. See individual comments. Most important:

we may need to add another build option or change the documentation for UTPP_USE_PLUS_SIGN
please take a second look at MemoryOutStream changes
I think we can reduce the Borland-specific lib/header dependence

pjohnmeyer · 2017-07-01T03:29:44Z

CMakeLists.txt

-
+
+if(BORLAND)
+    set(UTPP_USE_PLUS_SIGN OFF)


Is this set statement required for Borland? Can it not generate output files with + in the name?

pjohnmeyer · 2017-07-01T03:35:39Z

CMakeLists.txt

@@ -59,28 +66,34 @@ add_library(UnitTest++ STATIC ${headers_} ${sources_} ${platformHeaders_} ${plat

 if(${UTPP_USE_PLUS_SIGN})
 	set_target_properties(UnitTest++ PROPERTIES OUTPUT_NAME UnitTest++)
+else()
+	set_target_properties(UnitTest++ PROPERTIES OUTPUT_NAME UnitTestpp)


It seems to me this is changing the meaning of UTPP_USE_PLUS_SIGN; in its current incarnation it only changes the install path to use PP instead of ++. Am I right?

pjohnmeyer · 2017-07-01T03:42:43Z

UnitTest++/MemoryOutStream.cpp

-      m_text = this->str();
+      try
+      {
+            m_text = this->str();


Does the Borland implementation of ostringstream::str throw if nothing has been streamed in yet?

If so, can we catch a more specific exception? Maybe std::exception?

Or, can we change the exception mask to prevent the exception entirely? http://en.cppreference.com/w/cpp/io/basic_ios/exceptions

pjohnmeyer · 2017-07-01T03:46:12Z

tests/Main.cpp

@@ -1,4 +1,7 @@
 #include "UnitTest++/UnitTestPP.h"
+#ifdef __BORLANDC__
+	#include <vcl.h>


I didn't think we needed the Visual Component Library to run a console application?

pjohnmeyer · 2017-07-01T03:50:26Z

tests/TestCheckMacros.cpp

@@ -4,6 +4,9 @@
 #include "ScopedCurrentTest.h"

 using namespace std;
+#ifdef __BORLANDC__
+using namespace UnitTest;


Are there individual statements that can be changed, rather than adding this?

pjohnmeyer · 2017-07-01T04:04:21Z

UnitTest++/MemoryOutStream.cpp

      return m_text.c_str();
   }

   void MemoryOutStream::Clear()
   {
      this->str(std::string());
-      m_text = this->str();
+      m_text = std::string();


Maybe m_text.clear() instead of another allocation?

pjohnmeyer · 2017-07-01T04:06:57Z

tests/TestMemoryOutStream.cpp

@@ -257,6 +257,9 @@ namespace {
      CHECK_EQUAL("53124", stream.GetText());
   }

+   // Not sure why but this test fails with the Borland C++ 5.5 compiler.
+   // It throws an unhandled exception:
+   // unexpected NULL pointer in function: basic_string( const charT*,size_type,const Allocator&)


So, this test still fails, or did one of your other changes fix it?

Added conditional compiles around the "using namespace" per author re…

6c62f24

…commendation.

Alexis Denis added 2 commits November 21, 2016 16:24

pjohnmeyer requested changes Jul 1, 2017

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Adding Borland C++ Builder 5 support. #137

Adding Borland C++ Builder 5 support. #137

Uh oh!

dvader commented Nov 18, 2016

Uh oh!

grahamreeds commented Nov 19, 2016

Uh oh!

dvader commented Nov 20, 2016

Uh oh!

dvader commented Nov 20, 2016

Uh oh!

dvader commented Nov 29, 2016

Uh oh!

pjohnmeyer left a comment

Uh oh!

pjohnmeyer Jul 1, 2017

Uh oh!

pjohnmeyer Jul 1, 2017

Uh oh!

pjohnmeyer Jul 1, 2017

Uh oh!

pjohnmeyer Jul 1, 2017

Uh oh!

pjohnmeyer Jul 1, 2017

Uh oh!

pjohnmeyer Jul 1, 2017

Uh oh!

pjohnmeyer Jul 1, 2017

Uh oh!

Uh oh!

Adding Borland C++ Builder 5 support. #137

Are you sure you want to change the base?

Adding Borland C++ Builder 5 support. #137

Uh oh!

Conversation

dvader commented Nov 18, 2016

Uh oh!

grahamreeds commented Nov 19, 2016

but use __int64 instead.

Uh oh!

dvader commented Nov 20, 2016

Uh oh!

dvader commented Nov 20, 2016

Uh oh!

dvader commented Nov 29, 2016

Uh oh!

pjohnmeyer left a comment

Choose a reason for hiding this comment

Uh oh!

pjohnmeyer Jul 1, 2017

Choose a reason for hiding this comment

Uh oh!

pjohnmeyer Jul 1, 2017

Choose a reason for hiding this comment

Uh oh!

pjohnmeyer Jul 1, 2017

Choose a reason for hiding this comment

Uh oh!

pjohnmeyer Jul 1, 2017

Choose a reason for hiding this comment

Uh oh!

pjohnmeyer Jul 1, 2017

Choose a reason for hiding this comment

Uh oh!

pjohnmeyer Jul 1, 2017

Choose a reason for hiding this comment

Uh oh!

pjohnmeyer Jul 1, 2017

Choose a reason for hiding this comment

Uh oh!

Uh oh!