chore: remove Qt and SDL2 from radio unit tests (#6452)

This commit is contained in:
Raphael Coeffic
2025-07-24 08:05:18 +10:00
committed by GitHub
parent 9e86a3ea84
commit 538721ef6b
17 changed files with 226 additions and 200 deletions
+24 -42
View File
@@ -1,49 +1,31 @@
if(Qt6Widgets_FOUND)
add_library(gtests-radio-lib STATIC EXCLUDE_FROM_ALL
${googletest_SOURCE_DIR}/googletest/src/gtest-all.cc
)
target_include_directories(gtests-radio-lib PRIVATE
${googletest_SOURCE_DIR}/googletest
)
add_library(gtests-radio-lib STATIC EXCLUDE_FROM_ALL
${googletest_SOURCE_DIR}/googletest/src/gtest-all.cc
)
target_include_directories(gtests-radio-lib PRIVATE
${googletest_SOURCE_DIR}/googletest
)
set(TESTS_PATH ${RADIO_SRC_DIR}/tests)
set(TESTS_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR})
configure_file(${RADIO_SRC_DIR}/tests/location.h.in ${CMAKE_CURRENT_BINARY_DIR}/location.h @ONLY)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_DEBUG} -O0 -fsanitize=address")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -O0 ${WARNING_FLAGS} -fsanitize=address")
set(TESTS_PATH ${RADIO_SRC_DIR}/tests)
set(TESTS_BUILD_PATH ${CMAKE_CURRENT_BINARY_DIR})
configure_file(${RADIO_SRC_DIR}/tests/location.h.in ${CMAKE_CURRENT_BINARY_DIR}/location.h @ONLY)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(WIN32)
target_include_directories(gtests-radio-lib PUBLIC ${WIN_INCLUDE_DIRS})
target_link_libraries(gtests-radio-lib PRIVATE ${WIN_LINK_LIBRARIES})
endif(WIN32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_DEBUG} -O0 -fsanitize=address")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -O0 ${WARNING_FLAGS} -fsanitize=address")
if(SDL2_FOUND)
target_include_directories(gtests-radio-lib PUBLIC ${SDL2_INCLUDE_DIR})
target_link_libraries(gtests-radio-lib PRIVATE ${SDL2_LIBRARIES})
endif()
file(GLOB TEST_SRC_FILES ${RADIO_SRC_DIR}/tests/*.cpp
CONFIGURE_DEPENDS "${RADIO_SRC_DIR}/tests/*.cpp")
set(TEST_SRC_FILES ${TEST_SRC_FILES}
${CMAKE_CURRENT_SOURCE_DIR}/location.h
${SIMU_SRC}
)
file(GLOB TEST_SRC_FILES ${RADIO_SRC_DIR}/tests/*.cpp
CONFIGURE_DEPENDS "${RADIO_SRC_DIR}/tests/*.cpp")
add_executable(gtests-radio EXCLUDE_FROM_ALL
${TEST_SRC_FILES}
)
target_compile_options(gtests-radio PRIVATE ${SIMU_SRC_OPTIONS})
set(TEST_SRC_FILES ${TEST_SRC_FILES}
${CMAKE_CURRENT_SOURCE_DIR}/location.h
${SIMU_SRC}
)
if(MINGW)
# struct packing breaks on MinGW w/out -mno-ms-bitfields: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991 & http://stackoverflow.com/questions/24015852/struct-packing-and-alignment-with-mingw
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
endif()
add_executable(gtests-radio EXCLUDE_FROM_ALL
${TEST_SRC_FILES}
)
target_compile_options(gtests-radio PRIVATE ${SIMU_SRC_OPTIONS})
add_dependencies(gtests-radio gtests-radio-lib)
target_link_libraries(gtests-radio gtests-radio-lib Qt::Core Qt::Widgets)
message(STATUS "Added optional gtests target")
endif()
target_link_libraries(gtests-radio gtests-radio-lib)
message(STATUS "Added optional gtests target")
+2 -2
View File
@@ -19,7 +19,6 @@
* GNU General Public License for more details.
*/
#include <QApplication>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -128,6 +127,8 @@ uint16_t simu_get_analog(uint8_t idx)
return 0;
}
void simuQueueAudio(const uint8_t*, uint32_t) {}
static char _stringResult[200];
const char * nchar2string(const char * string, int size)
@@ -144,7 +145,6 @@ extern const etx_hal_adc_driver_t simu_adc_driver;
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
simuInit();
adcInit(&simu_adc_driver);
-2
View File
@@ -21,11 +21,9 @@
#pragma once
#include <QtCore/QString>
#include <math.h>
#include <gtest/gtest.h>
#define SWAP_DEFINED
#include "edgetx.h"
#include "model_init.h"
#include "switches.h"
+88 -61
View File
@@ -20,84 +20,111 @@
*/
/* -*- coding: utf-8 -*- */
#include <QtCore/QDir>
#include <QtCore/QDebug>
#include <QApplication>
#include <QPainter>
#include <math.h>
#include <assert.h>
#include <gtest/gtest.h>
#define SWAP_DEFINED
#include "edgetx.h"
#include "location.h"
#include "targets/simu/simulcd.h"
void doPaint(QPainter & p)
#if !defined(COLORLCD)
#define STB_IMAGE_IMPLEMENTATION
#include "stb/stb_image.h"
#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb/stb_image_write.h"
#if LCD_W < 212
#define BPP 1
#else
#define BPP 4
#endif
static uint8_t _get_pixel(int x, int y)
{
QRgb rgb = qRgb(161, 161, 161);
assert(x < LCD_W && y < LCD_H);
p.setBackground(QBrush(rgb));
p.eraseRect(0, 0, LCD_W, LCD_H);
if (BPP == 1) {
if (simuLcdBuf[x + (y / 8) * LCD_W] & (1 << (y % 8))) {
return 0; // TODO
}
return 161;
}
if (1) {
#if LCD_W < 212
rgb = qRgb(0, 0, 0);
p.setPen(rgb);
p.setBrush(QBrush(rgb));
#endif
if (BPP == 4) {
pixel_t p = simuLcdBuf[y / 2 * LCD_W + x];
uint8_t z = (y & 1) ? (p >> 4) : (p & 0x0F);
return 161 - ((uint16_t)z * 161) / 15; // TODO
}
}
#if LCD_W >= 212
unsigned int previousDepth = 0xFF;
#endif
static uint8_t _get_ref_pixel(const uint8_t* data, int x, int y, int bpp)
{
return data[(y * LCD_W + x) * bpp];
}
for (int y=0; y<LCD_H; y++) {
#if LCD_W >= 212
unsigned int idx = (y/2) * LCD_W;
#else
unsigned int idx = (y/8) * LCD_W;
unsigned int mask = (1 << (y%8));
#endif
for (int x=0; x<LCD_W; x++, idx++) {
#if LCD_W < 212
if (simuLcdBuf[idx] & mask) {
p.drawPoint(x, y);
}
#else
unsigned int z = (y & 1) ? (simuLcdBuf[idx] >> 4) : (simuLcdBuf[idx] & 0x0F);
if (z) {
if (z != previousDepth) {
previousDepth = z;
rgb = qRgb(161-(z*161)/15, 161-(z*161)/15, 161-(z*161)/15);
p.setPen(rgb);
p.setBrush(QBrush(rgb));
}
p.drawPoint(x, y);
}
#endif
static void dumpImage(const std::string& filename)
{
std::string fullpath = TESTS_PATH "/images/color/failed_" + filename;
TRACE("dumping image '%s'", fullpath.c_str());
// allocate enough for 3 channels
std::vector<uint8_t> img;
auto stride = LCD_W * 3;
auto pixel_bytes = stride * LCD_H;
img.resize(pixel_bytes);
for (int y = 0; y < LCD_H; y++) {
for (int x = 0; x < LCD_W; x++) {
auto p = _get_pixel(x, y);
auto offset = (y * LCD_W + x) * 3;
img[offset + 0] = p;
img[offset + 1] = p;
img[offset + 2] = p;
}
}
stbi_write_png(fullpath.c_str(), LCD_W, LCD_H, 3, img.data(), stride);
}
bool checkScreenshot(const char* test)
{
lcdRefresh();
std::string filename = std::string(test);
filename += '_' + std::to_string(LCD_W);
filename += 'x' + std::to_string(LCD_H);
filename += ".png";
std::string fullpath = TESTS_PATH "/images/bw/" + filename;
// Read data
int32_t w, h, bpp;
std::shared_ptr<uint8_t> ref_data = {
stbi_load(fullpath.c_str(), &w, &h, &bpp, 0), stbi_image_free};
if (!ref_data || w != LCD_W || h != LCD_H) {
dumpImage(filename);
return false;
}
for (int y = 0; y < LCD_H; y++) {
for (int x = 0; x < LCD_W; x++) {
auto p = _get_pixel(x, y);
auto ref_p = _get_ref_pixel(ref_data.get(), x, y, bpp);
if (p != ref_p) {
dumpImage(filename);
return false;
}
}
}
return true;
}
bool checkScreenshot(const QString & test)
{
lcdRefresh();
QImage buffer(LCD_W, LCD_H, QImage::Format_RGB32);
QPainter p(&buffer);
doPaint(p);
QString filename(QString("%1_%2x%3.png").arg(test).arg(LCD_W).arg(LCD_H));
QImage reference(TESTS_PATH "/images/bw/" + filename);
if (buffer == reference) {
return true;
}
else {
buffer.save(TESTS_PATH "/images/bw/failed_" + filename);
return false;
}
}
#if !defined(COLORLCD)
TEST(outdezNAtt, test_unsigned)
{
lcdClear();
+6 -6
View File
@@ -22,7 +22,6 @@
#include <gtest/gtest.h>
#include <math.h>
#define SWAP_DEFINED
#include "location.h"
#include "edgetx.h"
@@ -53,12 +52,13 @@ void dumpImage(const std::string& filename, const BitmapBuffer* dc)
TRACE("dumping image '%s'", fullpath.c_str());
// allocate enough for 3 channels
auto pixels = dc->width() * dc->height();
std::vector<uint8_t> img;
auto stride = dc->width() * 3;
uint8_t* img = (uint8_t*)malloc(pixels * 3);
convert_RGB565_to_RGB888(img, dc, dc->width(), dc->height());
stbi_write_png(fullpath.c_str(), dc->width(), dc->height(), 3, img, stride);
free(img);
auto pixel_bytes = stride * dc->height();
img.resize(pixel_bytes);
convert_RGB565_to_RGB888(img.data(), dc, dc->width(), dc->height());
stbi_write_png(fullpath.c_str(), dc->width(), dc->height(), 3, img.data(), stride);
}
bool checkScreenshot_colorlcd(const BitmapBuffer* dc, const char* test)
-1
View File
@@ -24,7 +24,6 @@
#if defined(LUA)
#define SWAP_DEFINED
#include "edgetx.h"
#include "lua/lua_states.h"