Instatiate macros in the compile tests

This requires suppressing `no-c++11-long-long` in C++98/03 (and `c++98-compat-pedantic` in others).
webgpu-native · Oct 24, 2023 · b1f70e3 · b1f70e3
1 parent 92c2b1a
commit b1f70e3
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 28 deletions.
diff --git a/tests/compile/.gitignore b/tests/compile/.gitignore
@@ -0,0 +1 @@
+*.out
diff --git a/tests/compile/Makefile b/tests/compile/Makefile
@@ -6,27 +6,33 @@ all: main-c.out main-cpp.out
 clean:
 	rm -f main-c.out main-cpp.out
 
-CLANG_WARNINGS = -Weverything -Wno-padded -Wno-poison-system-directories
-GCC_WARNINGS = -Wall -Wextra
+CLANG_WARNINGS = -Werror -Weverything -Wno-padded -Wno-poison-system-directories -Wno-c++98-compat-pedantic
+GCC_WARNINGS   = -Werror -Wall -Wextra
 
-main-c.out: main.c ../../webgpu.h Makefile
-	clang -std=c99 $(CLANG_WARNINGS) -o $@ $<
-	gcc   -std=c99 $(GCC_WARNINGS)   -o $@ $<
-	clang -std=c11 $(CLANG_WARNINGS) -o $@ $<
-	gcc   -std=c11 $(GCC_WARNINGS)   -o $@ $<
-	clang -std=c17 $(CLANG_WARNINGS) -o $@ $<
-	gcc   -std=c17 $(GCC_WARNINGS)   -o $@ $<
+main-c.out: main.c main.inl ../../webgpu.h Makefile
+	clang -o $@ $< -std=c99 $(CLANG_WARNINGS)
+	gcc   -o $@ $< -std=c99 $(GCC_WARNINGS)
+	clang -o $@ $< -std=c11 $(CLANG_WARNINGS)
+	gcc   -o $@ $< -std=c11 $(GCC_WARNINGS)
+	clang -o $@ $< -std=c17 $(CLANG_WARNINGS)
+	gcc   -o $@ $< -std=c17 $(GCC_WARNINGS)
+	# Pre-release C23
+	clang -o $@ $< -std=c2x $(CLANG_WARNINGS)
+	gcc   -o $@ $< -std=c2x $(GCC_WARNINGS)
 
-main-cpp.out: main.cpp ../../webgpu.h Makefile
-	clang++ -std=c++98 $(CLANG_WARNINGS) -o $@ $<
-	g++     -std=c++98 $(GCC_WARNINGS)   -o $@ $<
-	clang++ -std=c++03 $(CLANG_WARNINGS) -o $@ $<
-	g++     -std=c++03 $(GCC_WARNINGS)   -o $@ $<
-	clang++ -std=c++11 $(CLANG_WARNINGS) -o $@ $<
-	g++     -std=c++11 $(GCC_WARNINGS)   -o $@ $<
-	clang++ -std=c++14 $(CLANG_WARNINGS) -o $@ $<
-	g++     -std=c++14 $(GCC_WARNINGS)   -o $@ $<
-	clang++ -std=c++17 $(CLANG_WARNINGS) -o $@ $<
-	g++     -std=c++17 $(GCC_WARNINGS)   -o $@ $<
-	clang++ -std=c++20 $(CLANG_WARNINGS) -o $@ $<
-	g++     -std=c++20 $(GCC_WARNINGS)   -o $@ $<
+main-cpp.out: main.cpp main.inl ../../webgpu.h Makefile
+	clang++ -o $@ $< -std=c++98 $(CLANG_WARNINGS) -Wno-c++11-long-long
+	g++     -o $@ $< -std=c++98 $(GCC_WARNINGS)
+	clang++ -o $@ $< -std=c++03 $(CLANG_WARNINGS) -Wno-c++11-long-long
+	g++     -o $@ $< -std=c++03 $(GCC_WARNINGS)
+	clang++ -o $@ $< -std=c++11 $(CLANG_WARNINGS)
+	g++     -o $@ $< -std=c++11 $(GCC_WARNINGS)
+	clang++ -o $@ $< -std=c++14 $(CLANG_WARNINGS)
+	g++     -o $@ $< -std=c++14 $(GCC_WARNINGS)
+	clang++ -o $@ $< -std=c++17 $(CLANG_WARNINGS)
+	g++     -o $@ $< -std=c++17 $(GCC_WARNINGS)
+	clang++ -o $@ $< -std=c++20 $(CLANG_WARNINGS)
+	g++     -o $@ $< -std=c++20 $(GCC_WARNINGS)
+	# Pre-release C++23
+	clang++ -o $@ $< -std=c++2b $(CLANG_WARNINGS)
+	g++     -o $@ $< -std=c++2b $(GCC_WARNINGS)
diff --git a/tests/compile/main.c b/tests/compile/main.c
@@ -1,3 +1 @@
-#include "../../webgpu.h"
-
-int main(void) {}
+#include "main.inl"
diff --git a/tests/compile/main.cpp b/tests/compile/main.cpp
@@ -1,3 +1 @@
-#include "../../webgpu.h"
-
-int main(void) {}
+#include "main.inl"
diff --git a/tests/compile/main.inl b/tests/compile/main.inl
@@ -0,0 +1,44 @@
+#include "../../webgpu.h"
+
+// Compile-test - doesn't need to be main(), because we just build a .o.
+int main(void) {
+    // Complile-test instantiation of all of the macros, and check types
+    {
+        WGPUTextureViewDescriptor a;
+        a.mipLevelCount = WGPU_MIP_LEVEL_COUNT_UNDEFINED;
+        a.arrayLayerCount = WGPU_ARRAY_LAYER_COUNT_UNDEFINED;
+        (void) a;
+    }
+    {
+        WGPUTextureDataLayout a;
+        uint32_t x = a.bytesPerRow = WGPU_COPY_STRIDE_UNDEFINED;
+        uint32_t y = a.rowsPerImage = WGPU_COPY_STRIDE_UNDEFINED;
+        (void) a;
+        (void) x;
+        (void) y;
+    }
+    {
+        WGPUBindGroupEntry a;
+        uint64_t x = a.size = WGPU_WHOLE_SIZE;
+        (void) a;
+        (void) x;
+    }
+    {
+        uint64_t x = WGPU_WHOLE_MAP_SIZE;
+        (void) x;
+    }
+    {
+        WGPULimits a;
+        uint32_t x = a.maxTextureDimension2D = WGPU_LIMIT_U32_UNDEFINED;
+        uint64_t y = a.maxBufferSize = WGPU_LIMIT_U64_UNDEFINED;
+        (void) a;
+        (void) x;
+        (void) y;
+    }
+    {
+        WGPUComputePassTimestampWrites a;
+        a.beginningOfPassWriteIndex = WGPU_QUERY_SET_INDEX_UNDEFINED;
+        a.endOfPassWriteIndex = WGPU_QUERY_SET_INDEX_UNDEFINED;
+        (void) a;
+    }
+}