Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix copying testdata.fc file to the tests build directory

Browse Source 
This file was listed in test.bkl but wasn't actually copied because the
value of <files> was overwritten by another <files> just below ever
since the changes of 21fe35aff7 (add wxImage test units to test loading
from both seekable and non-seekable streams, 2009-06-01).

Fix this by splitting this wx-data into 2 different ones, to avoid this
conflict.
This commit is contained in:
Vadim Zeitlin
2021-11-28 22:05:46 +01:00
parent 9febbe2b30
commit 5efcaf4e59
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/Makefile.in
View File

@@ -448,7 +448,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
### Targets: ###
all: test$(EXEEXT) $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) $(__test_gui_bundle___depname) $(__test_allheaders___depname) $(__test_allheaders_bundle___depname) data data-images fr ja
all: test$(EXEEXT) $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) $(__test_gui_bundle___depname) $(__test_allheaders___depname) $(__test_allheaders_bundle___depname) data data-image-sample data-images fr ja
install:
@@ -552,6 +552,18 @@ test$(EXEEXT): $(TEST_OBJECTS)
@COND_USE_PCH_1@ $(BK_MAKE_PCH) ./.pch/testprec_test_allheaders/testprec.h.gch testprec.h $(CXX) $(TEST_ALLHEADERS_CXXFLAGS)
data:
@mkdir -p .
@for f in testdata.fc; do \
if test ! -f ./$$f -a ! -d ./$$f ; \
then x=yep ; \
else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
fi; \
case "$$x" in ?*) \
cp -pRf $(srcdir)/$$f . ;; \
esac; \
done
data-image-sample:
@mkdir -p .
@for f in horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm; do \
if test ! -f ./$$f -a ! -d ./$$f ; \
@@ -1248,4 +1260,4 @@ failtest_allheaders:
@IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean test_gui_bundle \
test_allheaders_bundle data data-images fr ja
test_allheaders_bundle data data-image-sample data-images fr ja

8
tests/makefile.gcc
View File

@@ -501,7 +501,7 @@ $(OBJS):
### Targets: ###
all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) $(__test_allheaders___depname) data data-images fr ja
all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) $(__test_allheaders___depname) data data-image-sample data-images fr ja
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -550,6 +550,10 @@ $(OBJS)\test_allheaders.exe: $(TEST_ALLHEADERS_OBJECTS) $(OBJS)\test_allheaders_
endif
data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
data-image-sample:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
@@ -1183,7 +1187,7 @@ $(OBJS)\test_allheaders_allheaders.o: ./allheaders.cpp
$(OBJS)\test_allheaders_testableframe.o: ./testableframe.cpp
$(CXX) -c -o $@ $(TEST_ALLHEADERS_CXXFLAGS) $(CPPDEPS) $<
.PHONY: all clean data data-images fr ja
.PHONY: all clean data data-image-sample data-images fr ja
SHELL := $(COMSPEC)

6
tests/makefile.vc
View File

@@ -928,7 +928,7 @@ $(OBJS):
### Targets: ###
all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) $(__test_allheaders___depname) data data-images fr ja
all: $(OBJS)\test.exe $(__test_drawing___depname) $(__test_drawingplugin___depname) $(__test_gui___depname) $(__test_allheaders___depname) data data-image-sample data-images fr ja
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -984,6 +984,10 @@ $(OBJS)\test_allheaders.exe: $(OBJS)\test_allheaders_dummy.obj $(TEST_ALLHEADER
!endif
data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
data-image-sample:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

2
tests/test.bkl
View File

@@ -339,7 +339,9 @@
<wx-data id="data">
<files>testdata.fc</files>
</wx-data>
<wx-data id="data-image-sample">
<!-- test data for image/image.cpp test unit: -->
<files>horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg
horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm</files>