solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Rename testdata.fc to testdata.conf

Browse source 
No real changes, just use a more clear and longer (which will be
important for the next commit) name for a test file.

Remove the non-existing samples/console/testdata.gc from make_dist.mk
(there are other non-existing files still referenced there).
This commit is contained in:
Vadim Zeitlin 2021-12-10 16:23:26 +00:00
parent c39c119707
commit 1e683c1401
9 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile.in
View file

@ -37606,7 +37606,6 @@ BASE_DIST: ALL_DIST INTL_DIST
$(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
mv $(DISTDIR) $(BASEDISTDIR) mv $(DISTDIR) $(BASEDISTDIR)

1
build/bakefiles/make_dist.mk
View file

@ -319,7 +319,6 @@ BASE_DIST: ALL_DIST INTL_DIST
$(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console $(CP_P) $(SAMPDIR)/console/console.dsp $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
mv $(DISTDIR) $(BASEDISTDIR) mv $(DISTDIR) $(BASEDISTDIR)

2
build/cmake/tests/base/CMakeLists.txt
View file

@ -114,7 +114,7 @@ set(TEST_DATA
horse.bmp horse.bmp
horse.png horse.png
horse.xpm horse.xpm
testdata.fc testdata.conf
) )
wx_add_test(test_base CONSOLE ${TEST_SRC} wx_add_test(test_base CONSOLE ${TEST_SRC}

2
tests/Makefile.in
View file

@ -553,7 +553,7 @@ test$(EXEEXT): $(TEST_OBJECTS)
data: data:
@mkdir -p . @mkdir -p .
@for f in testdata.fc horse.svg; do \ @for f in testdata.conf horse.svg; do \
if test ! -f ./$$f -a ! -d ./$$f ; \ if test ! -f ./$$f -a ! -d ./$$f ; \
then x=yep ; \ then x=yep ; \
else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \

2
tests/makefile.gcc
View file

@ -551,7 +551,7 @@ endif
data: data:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
for %%f in (testdata.fc horse.svg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) for %%f in (testdata.conf horse.svg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
data-image-sample: data-image-sample:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)

2
tests/makefile.vc
View file

@ -985,7 +985,7 @@ $(OBJS)\test_allheaders.exe: $(OBJS)\test_allheaders_dummy.obj $(TEST_ALLHEADER
data: data:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)
for %f in (testdata.fc horse.svg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) for %f in (testdata.conf horse.svg) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
data-image-sample: data-image-sample:
if not exist $(OBJS) mkdir $(OBJS) if not exist $(OBJS) mkdir $(OBJS)

2
tests/streams/textstreamtest.cpp
View file

@ -124,7 +124,7 @@ void TextStreamTestCase::Endline()
void TextStreamTestCase::MiscTests() void TextStreamTestCase::MiscTests()
{ {
wxString filename = wxT("testdata.fc"); wxString filename = wxT("testdata.conf");
wxFileInputStream fsIn(filename); wxFileInputStream fsIn(filename);
if ( !fsIn.IsOk() ) if ( !fsIn.IsOk() )
{ {

2
tests/test.bkl
View file

@ -338,7 +338,7 @@
<wx-data id="data"> <wx-data id="data">
<files>testdata.fc horse.svg</files> <files>testdata.conf horse.svg</files>
</wx-data> </wx-data>
<wx-data id="data-image-sample"> <wx-data id="data-image-sample">

0
tests/testdata.fc → tests/testdata.conf
View file