From b4a5b053cab79caceb48226ffe521d0c0fd771cc Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Tue, 27 Aug 2024 08:03:55 +0200
Subject: [PATCH] Merge conf_test for linux and windows

This reverts commit 83516e1740fb3a97419a099b9af1c8a3269c8d7c.
---
 .github/workflows/ci.yml                  | 12 ++++++------
 extras/conf_test/win32.cpp                | 14 --------------
 extras/conf_test/win64.cpp                | 14 --------------
 extras/conf_test/{linux64.cpp => x64.cpp} |  0
 extras/conf_test/{linux32.cpp => x86.cpp} |  0
 5 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 extras/conf_test/win32.cpp
 delete mode 100644 extras/conf_test/win64.cpp
 rename extras/conf_test/{linux64.cpp => x64.cpp} (100%)
 rename extras/conf_test/{linux32.cpp => x86.cpp} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad0695ea..ce7043ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -174,13 +174,13 @@ jobs:
       - name: AVR
         run: avr-g++ -std=c++11 -Isrc extras/conf_test/avr.cpp
       - name: GCC 32-bit
-        run: g++ -std=c++11 -m32 -Isrc extras/conf_test/linux32.cpp
+        run: g++ -std=c++11 -m32 -Isrc extras/conf_test/x86.cpp
       - name: GCC 64-bit
-        run: g++ -std=c++11 -m64 -Isrc extras/conf_test/linux64.cpp
+        run: g++ -std=c++11 -m64 -Isrc extras/conf_test/x64.cpp
       - name: Clang 32-bit
-        run: clang++ -std=c++11 -m32 -Isrc extras/conf_test/linux32.cpp
+        run: clang++ -std=c++11 -m32 -Isrc extras/conf_test/x86.cpp
       - name: Clang 64-bit
-        run: clang++ -std=c++11 -m64 -Isrc extras/conf_test/linux64.cpp
+        run: clang++ -std=c++11 -m64 -Isrc extras/conf_test/x64.cpp
 
   conf_test_windows:
     name: Test configuration on Windows
@@ -192,12 +192,12 @@ jobs:
       - name: 32-bit
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
-          cl /Isrc extras/conf_test/win32.cpp
+          cl /Isrc extras/conf_test/x86.cpp
         shell: cmd
       - name: 64-bit
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          cl /Isrc extras/conf_test/win64.cpp
+          cl /Isrc extras/conf_test/x64.cpp
         shell: cmd
 
   xcode:
diff --git a/extras/conf_test/win32.cpp b/extras/conf_test/win32.cpp
deleted file mode 100644
index befe73d3..00000000
--- a/extras/conf_test/win32.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <ArduinoJson.h>
-
-static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
-
-static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE");
-
-static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
-
-static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
-
-static_assert(sizeof(ArduinoJson::detail::VariantData) == 8,
-              "sizeof(VariantData)");
-
-int main() {}
diff --git a/extras/conf_test/win64.cpp b/extras/conf_test/win64.cpp
deleted file mode 100644
index 0b6fd16b..00000000
--- a/extras/conf_test/win64.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <ArduinoJson.h>
-
-static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
-
-static_assert(ARDUINOJSON_SLOT_ID_SIZE == 4, "ARDUINOJSON_SLOT_ID_SIZE");
-
-static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
-
-static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
-
-static_assert(sizeof(ArduinoJson::detail::VariantData) == 16,
-              "sizeof(VariantData)");
-
-int main() {}
diff --git a/extras/conf_test/linux64.cpp b/extras/conf_test/x64.cpp
similarity index 100%
rename from extras/conf_test/linux64.cpp
rename to extras/conf_test/x64.cpp
diff --git a/extras/conf_test/linux32.cpp b/extras/conf_test/x86.cpp
similarity index 100%
rename from extras/conf_test/linux32.cpp
rename to extras/conf_test/x86.cpp