Merge conf_test for linux and windows

This reverts commit 83516e1740.

.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:

extras/conf_test/win32.cpp

@@ -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() {}

extras/conf_test/win64.cpp

@@ -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() {}