Merge pull request #1648 from thetic/no-long-long

Fix use with `long long` disabled
cpputest · Nov 1, 2022 · 944ce90 · 944ce90
2 parents 8cc621c + ccae5be
commit 944ce90
Show file tree

Hide file tree

Showing 23 changed files with 141 additions and 107 deletions.
diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml
@@ -155,3 +155,31 @@ jobs:
         run: cmake --build cpputest_build
       - name: Test
         run: ctest --test-dir cpputest_build
+
+  automake-no-long-long:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+      - name: Configure
+        run: |
+          autoreconf -i .
+          ./configure --disable-longlong
+      - name: Build and test
+        run: make tdd
+
+  cmake-no-long-long:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+      - name: Configure
+        run: >
+          cmake
+          -B cpputest_build
+          -D CPPUTEST_USE_LONG_LONG=NO
+          -D CMAKE_CXX_COMPILER=clang++
+      - name: Build
+        run: cmake --build cpputest_build -j
+      - name: Test
+        run: ctest --test-dir cpputest_build -j
diff --git a/include/CppUTest/CppUTestConfig.h b/include/CppUTest/CppUTestConfig.h
@@ -274,10 +274,11 @@
  * LLONG_MAX is set in limits.h. This is a crude attempt to detect long long support when no configure is used
  *
  */
-
-#if !defined(CPPUTEST_LONG_LONG_DISABLED) && !defined(CPPUTEST_USE_LONG_LONG)
-#if defined(CPPUTEST_HAVE_LONG_LONG_INT) || defined(LLONG_MAX)
+#ifndef CPPUTEST_USE_LONG_LONG
+#if !defined(CPPUTEST_LONG_LONG_DISABLED) && (defined(CPPUTEST_HAVE_LONG_LONG_INT) || defined(LLONG_MAX))
 #define CPPUTEST_USE_LONG_LONG 1
+#else
+#define CPPUTEST_USE_LONG_LONG 0
 #endif
 #endif
 
@@ -295,27 +296,22 @@ typedef unsigned long long cpputest_ulonglong;
 #define CPPUTEST_SIZE_OF_FAKE_LONG_LONG_TYPE 8
 #endif
 
-struct cpputest_longlong
-{
 #if defined(__cplusplus)
-  cpputest_longlong() {}
-  cpputest_longlong(int) {}
+extern "C" {
 #endif
+
+typedef struct
+{
   char dummy[CPPUTEST_SIZE_OF_FAKE_LONG_LONG_TYPE];
-};
+} cpputest_longlong;
 
-struct cpputest_ulonglong
+typedef struct
 {
-#if defined(__cplusplus)
-  cpputest_ulonglong() {}
-  cpputest_ulonglong(int) {}
-#endif
   char dummy[CPPUTEST_SIZE_OF_FAKE_LONG_LONG_TYPE];
-};
+} cpputest_ulonglong;
 
-#if !defined(__cplusplus)
-typedef struct cpputest_longlong cpputest_longlong;
-typedef struct cpputest_ulonglong cpputest_ulonglong;
+#if defined(__cplusplus)
+} /* extern "C" */
 #endif
 
 #endif

diff --git a/include/CppUTest/UtestMacros.h b/include/CppUTest/UtestMacros.h
@@ -226,6 +226,7 @@
 #define UNSIGNED_LONGS_EQUAL_LOCATION(expected, actual, text, file, line)\
   do { UtestShell::getCurrent()->assertUnsignedLongsEqual((unsigned long)expected, (unsigned long)actual, text, file, line); } while(0)
 
+#if CPPUTEST_USE_LONG_LONG
 #define LONGLONGS_EQUAL(expected, actual)\
   LONGLONGS_EQUAL_LOCATION(expected, actual, NULLPTR, __FILE__, __LINE__)
 
@@ -243,6 +244,7 @@
 
 #define UNSIGNED_LONGLONGS_EQUAL_LOCATION(expected, actual, text, file, line)\
         do { UtestShell::getCurrent()->assertUnsignedLongLongsEqual((cpputest_ulonglong)expected, (cpputest_ulonglong)actual, text, file, line); } while(0)
+#endif // CPPUTEST_USE_LONG_LONG
 
 #define BYTES_EQUAL(expected, actual)\
     LONGS_EQUAL((expected) & 0xff,(actual) & 0xff)

diff --git a/include/CppUTestExt/MockCheckedActualCall.h b/include/CppUTestExt/MockCheckedActualCall.h
@@ -269,10 +269,28 @@ class MockIgnoredActualCall: public MockActualCall
     virtual long int returnLongIntValue() _override { return 0; }
     virtual long int returnLongIntValueOrDefault(long int value) _override { return value; }
 
-    virtual cpputest_ulonglong returnUnsignedLongLongIntValue() _override { return 0; }
+    virtual cpputest_ulonglong returnUnsignedLongLongIntValue() _override
+    {
+#if CPPUTEST_USE_LONG_LONG
+        return 0;
+#else
+        cpputest_ulonglong ret = {};
+        return ret;
+#endif
+    }
+
     virtual cpputest_ulonglong returnUnsignedLongLongIntValueOrDefault(cpputest_ulonglong value) _override { return value; }
 
-    virtual cpputest_longlong returnLongLongIntValue() _override { return 0; }
+    virtual cpputest_longlong returnLongLongIntValue() _override
+    {
+#if CPPUTEST_USE_LONG_LONG
+        return 0;
+#else
+        cpputest_longlong ret = {};
+        return ret;
+#endif
+    }
+
     virtual cpputest_longlong returnLongLongIntValueOrDefault(cpputest_longlong value) _override { return value; }
 
     virtual unsigned int returnUnsignedIntValue() _override { return 0; }

diff --git a/include/CppUTestExt/MockNamedValue.h b/include/CppUTestExt/MockNamedValue.h
@@ -167,7 +167,7 @@ class MockNamedValue
         unsigned int unsignedIntValue_;
         long int longIntValue_;
         unsigned long int unsignedLongIntValue_;
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
         cpputest_longlong longLongIntValue_;
         cpputest_ulonglong unsignedLongLongIntValue_;
 #else

diff --git a/include/CppUTestExt/MockSupport_c.h b/include/CppUTestExt/MockSupport_c.h
@@ -61,7 +61,7 @@ typedef struct SMockValue_c
         unsigned int unsignedIntValue;
         long int longIntValue;
         unsigned long int unsignedLongIntValue;
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
         cpputest_longlong longLongIntValue;
         cpputest_ulonglong unsignedLongLongIntValue;
 #else

diff --git a/src/CppUTest/SimpleString.cpp b/src/CppUTest/SimpleString.cpp
@@ -781,7 +781,7 @@ SimpleString StringFrom(const std::nullptr_t value)
 }
 #endif
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 SimpleString StringFrom(cpputest_longlong value)
 {

diff --git a/src/CppUTest/Utest.cpp b/src/CppUTest/Utest.cpp
@@ -486,7 +486,7 @@ void UtestShell::assertUnsignedLongsEqual(unsigned long expected, unsigned long
 void UtestShell::assertLongLongsEqual(cpputest_longlong expected, cpputest_longlong actual, const char* text, const char* fileName, size_t lineNumber, const TestTerminator& testTerminator)
 {
     getTestResult()->countCheck();
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
     if (expected != actual)
         failWith(LongLongsEqualFailure(this, fileName, lineNumber, expected, actual, text), testTerminator);
 #else
@@ -499,7 +499,7 @@ void UtestShell::assertLongLongsEqual(cpputest_longlong expected, cpputest_longl
 void UtestShell::assertUnsignedLongLongsEqual(cpputest_ulonglong expected, cpputest_ulonglong actual, const char* text, const char* fileName, size_t lineNumber, const TestTerminator& testTerminator)
 {
     getTestResult()->countCheck();
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
     if (expected != actual)
         failWith(UnsignedLongLongsEqualFailure(this, fileName, lineNumber, expected, actual, text), testTerminator);
 #else

diff --git a/src/CppUTestExt/MockActualCall.cpp b/src/CppUTestExt/MockActualCall.cpp
@@ -241,7 +241,7 @@ MockActualCall& MockCheckedActualCall::withLongIntParameter(const SimpleString&
     return *this;
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 MockActualCall& MockCheckedActualCall::withUnsignedLongLongIntParameter(const SimpleString& name, cpputest_ulonglong value)
 {
@@ -472,7 +472,7 @@ long int MockCheckedActualCall::returnLongIntValueOrDefault(long int default_val
     return returnLongIntValue();
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 cpputest_ulonglong MockCheckedActualCall::returnUnsignedLongLongIntValue()
 {
@@ -505,7 +505,8 @@ cpputest_longlong MockCheckedActualCall::returnLongLongIntValueOrDefault(cpputes
 cpputest_ulonglong MockCheckedActualCall::returnUnsignedLongLongIntValue()
 {
     FAIL("Unsigned Long Long type is not supported");
-    return cpputest_ulonglong(0);
+    cpputest_ulonglong ret = {};
+    return ret;
 }
 
 cpputest_ulonglong MockCheckedActualCall::returnUnsignedLongLongIntValueOrDefault(cpputest_ulonglong default_value)
@@ -517,7 +518,8 @@ cpputest_ulonglong MockCheckedActualCall::returnUnsignedLongLongIntValueOrDefaul
 cpputest_longlong MockCheckedActualCall::returnLongLongIntValue()
 {
     FAIL("Long Long type is not supported");
-    return cpputest_longlong(0);
+    cpputest_longlong ret = {};
+    return ret;
 }
 
 cpputest_longlong MockCheckedActualCall::returnLongLongIntValueOrDefault(cpputest_longlong default_value)
@@ -727,7 +729,7 @@ MockActualCall& MockActualCallTrace::withLongIntParameter(const SimpleString& na
     return *this;
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 MockActualCall& MockActualCallTrace::withUnsignedLongLongIntParameter(const SimpleString& name, cpputest_ulonglong value)
 {
@@ -856,7 +858,7 @@ long int MockActualCallTrace::returnLongIntValueOrDefault(long int)
     return 0;
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 cpputest_longlong MockActualCallTrace::returnLongLongIntValue()
 {
@@ -883,25 +885,29 @@ cpputest_longlong MockActualCallTrace::returnLongLongIntValueOrDefault(cpputest_
 cpputest_longlong MockActualCallTrace::returnLongLongIntValue()
 {
     FAIL("Long Long type is not supported");
-    return cpputest_longlong(0);
+    cpputest_longlong ret = {};
+    return ret;
 }
 
 cpputest_ulonglong MockActualCallTrace::returnUnsignedLongLongIntValue()
 {
     FAIL("Unsigned Long Long type is not supported");
-    return cpputest_ulonglong(0);
+    cpputest_ulonglong ret = {};
+    return ret;
 }
 
 cpputest_ulonglong MockActualCallTrace::returnUnsignedLongLongIntValueOrDefault(cpputest_ulonglong)
 {
     FAIL("Unsigned Long Long type is not supported");
-    return cpputest_ulonglong(0);
+    cpputest_ulonglong ret = {};
+    return ret;
 }
 
 cpputest_longlong MockActualCallTrace::returnLongLongIntValueOrDefault(cpputest_longlong)
 {
     FAIL("Long Long type is not supported");
-    return cpputest_longlong(0);
+    cpputest_longlong ret = {};
+    return ret;
 }
 
 #endif

diff --git a/src/CppUTestExt/MockExpectedCall.cpp b/src/CppUTestExt/MockExpectedCall.cpp
@@ -125,7 +125,7 @@ MockExpectedCall& MockCheckedExpectedCall::withUnsignedLongIntParameter(const Si
     return *this;
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 MockExpectedCall& MockCheckedExpectedCall::withLongLongIntParameter(const SimpleString& name, cpputest_longlong value)
 {
@@ -514,7 +514,7 @@ MockExpectedCall& MockCheckedExpectedCall::andReturnValue(unsigned long int valu
     return *this;
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 MockExpectedCall& MockCheckedExpectedCall::andReturnValue(cpputest_longlong value)
 {

diff --git a/src/CppUTestExt/MockNamedValue.cpp b/src/CppUTestExt/MockNamedValue.cpp
@@ -82,7 +82,7 @@ void MockNamedValue::setValue(unsigned long int value)
     value_.unsignedLongIntValue_ = value;
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 void MockNamedValue::setValue(cpputest_longlong value)
 {
@@ -246,7 +246,7 @@ unsigned long int MockNamedValue::getUnsignedLongIntValue() const
     }
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 cpputest_longlong MockNamedValue::getLongLongIntValue() const
 {
@@ -289,13 +289,15 @@ cpputest_ulonglong MockNamedValue::getUnsignedLongLongIntValue() const
 cpputest_longlong MockNamedValue::getLongLongIntValue() const
 {
     FAIL("Long Long type is not supported");
-    return cpputest_longlong(0);
+    cpputest_longlong ret = {};
+    return ret;
 }
 
 cpputest_ulonglong MockNamedValue::getUnsignedLongLongIntValue() const
 {
     FAIL("Unsigned Long Long type is not supported");
-    return cpputest_ulonglong(0);
+    cpputest_ulonglong ret = {};
+    return ret;
 }
 
 #endif
@@ -393,7 +395,7 @@ bool MockNamedValue::equals(const MockNamedValue& p) const
         return (value_.longIntValue_ >= 0) && ((unsigned long)value_.longIntValue_ == p.value_.unsignedLongIntValue_);
     else if((type_ == "unsigned long int") && (p.type_ == "long int"))
         return (p.value_.longIntValue_ >= 0) && (value_.unsignedLongIntValue_ == (unsigned long) p.value_.longIntValue_);
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
     else if ((type_ == "long long int") && (p.type_ == "int"))
         return value_.longLongIntValue_ == p.value_.intValue_;
     else if ((type_ == "int") && (p.type_ == "long long int"))
@@ -444,7 +446,7 @@ bool MockNamedValue::equals(const MockNamedValue& p) const
         return value_.longIntValue_ == p.value_.longIntValue_;
     else if (type_ == "unsigned long int")
         return value_.unsignedLongIntValue_ == p.value_.unsignedLongIntValue_;
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
     else if (type_ == "long long int")
         return value_.longLongIntValue_ == p.value_.longLongIntValue_;
     else if (type_ == "unsigned long long int")
@@ -496,7 +498,7 @@ SimpleString MockNamedValue::toString() const
         return StringFrom(value_.longIntValue_) + " " + BracketsFormattedHexStringFrom(value_.longIntValue_);
     else if (type_ == "unsigned long int")
         return StringFrom(value_.unsignedLongIntValue_) + " " + BracketsFormattedHexStringFrom(value_.unsignedLongIntValue_);
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
     else if (type_ == "long long int")
         return StringFrom(value_.longLongIntValue_) + " " + BracketsFormattedHexStringFrom(value_.longLongIntValue_);
     else if (type_ == "unsigned long long int")

diff --git a/src/CppUTestExt/MockSupport.cpp b/src/CppUTestExt/MockSupport.cpp
@@ -546,7 +546,7 @@ unsigned long int MockSupport::unsignedLongIntReturnValue()
     return returnValue().getUnsignedLongIntValue();
 }
 
-#ifdef CPPUTEST_USE_LONG_LONG
+#if CPPUTEST_USE_LONG_LONG
 
 cpputest_longlong MockSupport::longLongIntReturnValue()
 {
@@ -579,13 +579,15 @@ cpputest_ulonglong MockSupport::returnUnsignedLongLongIntValueOrDefault(cpputest
 cpputest_longlong MockSupport::longLongIntReturnValue()
 {
     FAIL("Long Long type is not supported");
-    return cpputest_longlong(0);
+    cpputest_longlong ret = {};
+    return ret;
 }
 
 cpputest_ulonglong MockSupport::unsignedLongLongIntReturnValue()
 {
     FAIL("Unsigned Long Long type is not supported");
-    return cpputest_ulonglong(0);
+    cpputest_ulonglong ret = {};
+    return ret;
 }
 
 cpputest_longlong MockSupport::returnLongLongIntValueOrDefault(cpputest_longlong defaultValue)