93e72b695e
The libcamera internal headers are located in src/libcamera/include/. The directory is added to the compiler headers search path with a meson include_directories() directive, and internal headers are included with (e.g. for the internal semaphore.h header) #include "semaphore.h" All was well, until libcxx decided to implement the C++20 synchronization library. The __threading_support header gained a #include <semaphore.h> to include the pthread's semaphore support. As include_directories() adds src/libcamera/include/ to the compiler search path with -I, the internal semaphore.h is included instead of the pthread version. Needless to say, the compiler isn't happy. Three options have been considered to fix this issue: - Use -iquote instead of -I. The -iquote option instructs gcc to only consider the header search path for headers included with the "" version. Meson unfortunately doesn't support this option. - Rename the internal semaphore.h header. This was deemed to be the beginning of a long whack-a-mole game, where namespace clashes with system libraries would appear over time (possibly dependent on particular system configurations) and would need to be constantly fixed. - Move the internal headers to another directory to create a unique namespace through path components. This causes lots of churn in all the existing source files through the all project. The first option would be best, but isn't available to us due to missing support in meson. Even if -iquote support was added, we would need to fix the problem before a new version of meson containing the required support would be released. The third option is thus the only practical solution available. Bite the bullet, and do it, moving headers to include/libcamera/internal/. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Jacopo Mondi <jacopo@jmondi.org>
151 lines
3.1 KiB
C++
151 lines
3.1 KiB
C++
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2018, Google Inc.
|
|
*
|
|
* utils.cpp - Miscellaneous utility tests
|
|
*/
|
|
|
|
#include <iostream>
|
|
#include <sstream>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <libcamera/geometry.h>
|
|
|
|
#include "libcamera/internal/utils.h"
|
|
|
|
#include "test.h"
|
|
|
|
using namespace std;
|
|
using namespace libcamera;
|
|
|
|
class UtilsTest : public Test
|
|
{
|
|
protected:
|
|
int testDirname()
|
|
{
|
|
static const std::vector<std::string> paths = {
|
|
"",
|
|
"///",
|
|
"/bin",
|
|
"/usr/bin",
|
|
"//etc////",
|
|
"//tmp//d//",
|
|
"current_file",
|
|
"./current_file",
|
|
"./current_dir/",
|
|
"current_dir/",
|
|
};
|
|
|
|
static const std::vector<std::string> expected = {
|
|
".",
|
|
"/",
|
|
"/",
|
|
"/usr",
|
|
"/",
|
|
"//tmp",
|
|
".",
|
|
".",
|
|
".",
|
|
".",
|
|
};
|
|
|
|
std::vector<std::string> results;
|
|
|
|
for (const auto &path : paths)
|
|
results.push_back(utils::dirname(path));
|
|
|
|
if (results != expected) {
|
|
cerr << "utils::dirname() tests failed" << endl;
|
|
|
|
cerr << "expected: " << endl;
|
|
for (const auto &path : expected)
|
|
cerr << "\t" << path << endl;
|
|
|
|
cerr << "results: " << endl;
|
|
for (const auto &path : results)
|
|
cerr << "\t" << path << endl;
|
|
|
|
return TestFail;
|
|
}
|
|
|
|
return TestPass;
|
|
}
|
|
|
|
int run()
|
|
{
|
|
/* utils::hex() test. */
|
|
std::ostringstream os;
|
|
std::string ref;
|
|
|
|
os << utils::hex(static_cast<int32_t>(0x42)) << " ";
|
|
ref += "0x00000042 ";
|
|
os << utils::hex(static_cast<uint32_t>(0x42)) << " ";
|
|
ref += "0x00000042 ";
|
|
os << utils::hex(static_cast<int64_t>(0x42)) << " ";
|
|
ref += "0x0000000000000042 ";
|
|
os << utils::hex(static_cast<uint64_t>(0x42)) << " ";
|
|
ref += "0x0000000000000042 ";
|
|
os << utils::hex(static_cast<int32_t>(0x42), 4) << " ";
|
|
ref += "0x0042 ";
|
|
os << utils::hex(static_cast<uint32_t>(0x42), 1) << " ";
|
|
ref += "0x42 ";
|
|
os << utils::hex(static_cast<int64_t>(0x42), 4) << " ";
|
|
ref += "0x0042 ";
|
|
os << utils::hex(static_cast<uint64_t>(0x42), 1) << " ";
|
|
ref += "0x42 ";
|
|
|
|
std::string s = os.str();
|
|
if (s != ref) {
|
|
cerr << "utils::hex() test failed, expected '" << ref
|
|
<< "', got '" << s << "'";
|
|
return TestFail;
|
|
}
|
|
|
|
/* utils::join() and utils::split() test. */
|
|
std::vector<std::string> elements = {
|
|
"/bin",
|
|
"/usr/bin",
|
|
"",
|
|
"",
|
|
};
|
|
|
|
std::string path;
|
|
for (const auto &element : elements)
|
|
path += (path.empty() ? "" : ":") + element;
|
|
|
|
if (path != utils::join(elements, ":")) {
|
|
cerr << "utils::join() test failed" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
std::vector<std::string> dirs;
|
|
|
|
for (const auto &dir : utils::split(path, ":"))
|
|
dirs.push_back(dir);
|
|
|
|
if (dirs != elements) {
|
|
cerr << "utils::split() test failed" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/* utils::join() with conversion function test. */
|
|
std::vector<Size> sizes = { { 0, 0 }, { 100, 100 } };
|
|
s = utils::join(sizes, "/", [](const Size &size) {
|
|
return size.toString();
|
|
});
|
|
|
|
if (s != "0x0/100x100") {
|
|
cerr << "utils::join() with conversion test failed" << endl;
|
|
return TestFail;
|
|
}
|
|
|
|
/* utils::dirname() tests. */
|
|
if (TestPass != testDirname())
|
|
return TestFail;
|
|
|
|
return TestPass;
|
|
}
|
|
};
|
|
|
|
TEST_REGISTER(UtilsTest)
|