luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-05-04 10:33:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix build & test conformance issues on mingw32/gcc and mingw64/clang

Browse source 
tests/main.cpp:
Add Windows-only code for running test contexts under a thread with enough stack space regardless of the build settings of the compiler. GCC/Clang/MSVC settings for stack size are wildly varied and this is a catch all solution instead.
This only failed on mingw64/clang. mingw32/gcc and mingw64/gcc continued working without this change.

CLI/Reduce.cpp:
Never worked under MinGW as-is. Add check for MinGW as they're defined.

VM/src/lmem.cpp:
MinGW layout follows more closely MSVC. Checks before were only correct for 32-bit gcc / clang in non-Windows.

NOTES:
__MINGW32__ is defined on both 32-bit and 64-bit, __MINGW64__ is 64-bit only.
32-bit MinGW compilers (both Clang & GCC) have a floating point test error on math.noise, specifically math.lua:258. All other test cases / unit tests pass. Math begins deviating at `perlin_fade`.
This commit is contained in:
jdp_ 2023-09-01 00:41:28 -04:00 • committed by Arseny Kapoulkine
parent f0a2e79365
commit 0d3c356984
3 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CLI/Reduce.cpp
View file

@ -15,7 +15,7 @@
#define VERBOSE 0 // 1 - print out commandline invocations. 2 - print out stdout #define VERBOSE 0 // 1 - print out commandline invocations. 2 - print out stdout
#ifdef _WIN32 #if defined(_WIN32) && !defined(__MINGW32__)
const auto popen = &_popen; const auto popen = &_popen;
const auto pclose = &_pclose; const auto pclose = &_pclose;

2
VM/src/lmem.cpp
View file

@ -98,6 +98,8 @@
*/ */
#if defined(__APPLE__) #if defined(__APPLE__)
#define ABISWITCH(x64, ms32, gcc32) (sizeof(void*) == 8 ? x64 : gcc32) #define ABISWITCH(x64, ms32, gcc32) (sizeof(void*) == 8 ? x64 : gcc32)
#elif defined(__i386__) && defined(__MINGW32__) && !defined(__MINGW64__)
#define ABISWITCH(x64, ms32, gcc32) (ms32)
#elif defined(__i386__) && !defined(_MSC_VER) #elif defined(__i386__) && !defined(_MSC_VER)
#define ABISWITCH(x64, ms32, gcc32) (gcc32) #define ABISWITCH(x64, ms32, gcc32) (gcc32)
#else #else

27
tests/main.cpp
View file

@ -13,7 +13,7 @@
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif #endif
#include <Windows.h> // IsDebuggerPresent #include <Windows.h> // IsDebuggerPresent, CreateThread
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
@ -249,6 +249,22 @@ static void setFastFlags(const std::vector<doctest::String>& flags)
} }
} }
#if defined(_WIN32)
struct thrdarg
{
int* result;
doctest::Context* ctx;
};
DWORD WINAPI testthreadproc(LPVOID param)
{
auto threadresult = ((thrdarg*)param)->result;
auto context = ((thrdarg*)param)->ctx;
*threadresult = context->run();
return 0;
}
#endif
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
Luau::assertHandler() = testAssertionHandler; Luau::assertHandler() = testAssertionHandler;
@ -327,7 +343,16 @@ int main(int argc, char** argv)
} }
} }
#if !defined(_WIN32)
int result = context.run(); int result = context.run();
#else
int result;
thrdarg args;
args.result = &result;
args.ctx = &context;
HANDLE testthread = CreateThread(NULL, 0x400000, testthreadproc, &args, 0, NULL);
WaitForSingleObject(testthread, INFINITE);
#endif
if (doctest::parseFlag(argc, argv, "--help") || doctest::parseFlag(argc, argv, "-h")) if (doctest::parseFlag(argc, argv, "--help") || doctest::parseFlag(argc, argv, "-h"))
{ {
printf("Additional command line options:\n"); printf("Additional command line options:\n");