diff --git a/Makefile.in b/Makefile.in index e094a30c98..95cfb87407 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37606,7 +37606,6 @@ BASE_DIST: ALL_DIST INTL_DIST $(CP_P) $(SAMPDIR)/console/makefile.unx $(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/testdata.fc $(DISTDIR)/samples/console mv $(DISTDIR) $(BASEDISTDIR) diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 07beffa7ab..f737074087 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -319,7 +319,6 @@ BASE_DIST: ALL_DIST INTL_DIST $(CP_P) $(SAMPDIR)/console/makefile.unx $(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/testdata.fc $(DISTDIR)/samples/console mv $(DISTDIR) $(BASEDISTDIR) diff --git a/build/cmake/tests/base/CMakeLists.txt b/build/cmake/tests/base/CMakeLists.txt index 9a9ed4c11c..51db450bfd 100644 --- a/build/cmake/tests/base/CMakeLists.txt +++ b/build/cmake/tests/base/CMakeLists.txt @@ -114,7 +114,7 @@ set(TEST_DATA horse.bmp horse.png horse.xpm - testdata.fc + testdata.conf ) wx_add_test(test_base CONSOLE ${TEST_SRC} diff --git a/tests/Makefile.in b/tests/Makefile.in index 21e8258c99..e373ec8497 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -553,7 +553,7 @@ test$(EXEEXT): $(TEST_OBJECTS) data: @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 ; \ then x=yep ; \ else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \ diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 0cdc08d7aa..63ac959ae8 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -551,7 +551,7 @@ endif data: 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: if not exist $(OBJS) mkdir $(OBJS) diff --git a/tests/makefile.vc b/tests/makefile.vc index 4aa2cbf510..b2d0b1af04 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -985,7 +985,7 @@ $(OBJS)\test_allheaders.exe: $(OBJS)\test_allheaders_dummy.obj $(TEST_ALLHEADER data: 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: if not exist $(OBJS) mkdir $(OBJS) diff --git a/tests/streams/textstreamtest.cpp b/tests/streams/textstreamtest.cpp index d4c7bdaaf8..537d1bf124 100644 --- a/tests/streams/textstreamtest.cpp +++ b/tests/streams/textstreamtest.cpp @@ -124,7 +124,7 @@ void TextStreamTestCase::Endline() void TextStreamTestCase::MiscTests() { - wxString filename = wxT("testdata.fc"); + wxString filename = wxT("testdata.conf"); wxFileInputStream fsIn(filename); if ( !fsIn.IsOk() ) { diff --git a/tests/test.bkl b/tests/test.bkl index e45d45a5df..5299bd628b 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -338,7 +338,7 @@ - testdata.fc horse.svg + testdata.conf horse.svg diff --git a/tests/testdata.fc b/tests/testdata.conf similarity index 100% rename from tests/testdata.fc rename to tests/testdata.conf