diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2023-04-26 16:17:26 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2023-05-03 17:13:16 -0600 |
| commit | 7cc5ca1e92ed6961b62710c7341e455ac24c0dd1 (patch) | |
| tree | 8599ac99c2b52affd25c111e778797cbcc188192 | |
| parent | a697763b5a4e894398e216b901b1eb94e9078a72 (diff) | |
| download | librsvg-7cc5ca1e92ed6961b62710c7341e455ac24c0dd1.tar.gz | |
Visual Studio: Fix building/running C tests
Update the test source directories in the rules and the envvar that we set so
that the C tests will build and run properly
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
| -rw-r--r-- | win32/Makefile.vc | 2 | ||||
| -rw-r--r-- | win32/build-rules-msvc.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win32/Makefile.vc b/win32/Makefile.vc index 18cac2b7..44af22e7 100644 --- a/win32/Makefile.vc +++ b/win32/Makefile.vc @@ -41,7 +41,7 @@ all: $(RSVG_TOOLS) $(EXTRA_TARGETS) build-info-librsvg tests: all $(rsvg_tests) @set PATH=$(BINDIR);$(PATH) - set G_TEST_SRCDIR=$(MAKEDIR)\..\tests + set G_TEST_SRCDIR=$(MAKEDIR)\..\librsvg-c\tests-c @for %%x in ($(rsvg_tests)) do %%x rsvg_rust_tests: diff --git a/win32/build-rules-msvc.mak b/win32/build-rules-msvc.mak index 2a66774a..910e385e 100644 --- a/win32/build-rules-msvc.mak +++ b/win32/build-rules-msvc.mak @@ -25,7 +25,7 @@ $< $< << -{..\tests\}.c{$(OUTDIR)\rsvg-tests\}.obj: +{..\librsvg-c\tests-c\}.c{$(OUTDIR)\rsvg-tests\}.obj: @if not exist $(@D)\ mkdir $(@D) @if not exist $(@D)\..\librsvg\config.h copy .\config.h.win32 $(@D)\..\librsvg\config.h $(CC) $(TEST_CFLAGS) $(LIBRSVG_LOG_DOMAIN) $(TOOLS_DEP_INCLUDES) /Fo$(@D)\ /Fd$(@D)\ /c @<< |