feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Merge conf_test for linux and windows

Browse Source 
This reverts commit 83516e1740.
This commit is contained in:
Benoit Blanchon
2024-08-27 08:03:55 +02:00
parent e297932a98
commit b4a5b053ca
5 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View File

@ -174,13 +174,13 @@ jobs:
- name: AVR - name: AVR
run: avr-g++ -std=c++11 -Isrc extras/conf_test/avr.cpp run: avr-g++ -std=c++11 -Isrc extras/conf_test/avr.cpp
- name: GCC 32-bit - 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 - 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 - 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 - 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: conf_test_windows:
name: Test configuration on Windows name: Test configuration on Windows
@ -192,12 +192,12 @@ jobs:
- name: 32-bit - name: 32-bit
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" 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 shell: cmd
- name: 64-bit - name: 64-bit
run: | run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" 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 shell: cmd
xcode: xcode:

14
extras/conf_test/win32.cpp
View File

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

14
extras/conf_test/win64.cpp
View File

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

0
extras/conf_test/linux64.cpp → extras/conf_test/x64.cpp
View File

0
extras/conf_test/linux32.cpp → extras/conf_test/x86.cpp
View File