summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2020-07-23 01:53:24 +0200
committerAlbrecht Schlosser <albrechts.fltk@online.de>2020-07-23 01:53:24 +0200
commitf357f4311c6faedcb87f40144b83e2219538386c (patch)
treee5fd4b1c3a16407d5f53ef467ae997547235e6a9 /test
parent0015e64671a3c96a3600c23fa62935f981f78a1e (diff)
Use local images in test/help_dialog(.html)
- create subdir test/images - copy images used by test/help_dialog to this subdir - fix image URL's in test/help_dialog.html accordingly CMake: copy the entire test/images folder to the <build>/data folder This enables the demo test/help_dialog.cxx to find its images.
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt30
-rw-r--r--test/help_dialog.html26
-rw-r--r--test/images/FL200.pngbin0 -> 2626 bytes
-rw-r--r--test/images/Fl_Value_Input.pngbin0 -> 540 bytes
-rw-r--r--test/images/Fl_Value_Output.pngbin0 -> 573 bytes
-rw-r--r--test/images/tiny.pngbin0 -> 170 bytes
6 files changed, 38 insertions, 18 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d7ad60750..c1a98617b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,11 +15,16 @@
#
#######################################################################
+include (../CMake/FLTK-Functions.cmake)
+include (../CMake/fl_create_example.cmake)
+
set (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/../bin)
set (TESTFILE_PATH ${CMAKE_CURRENT_BINARY_DIR}/../data)
-include (../CMake/FLTK-Functions.cmake)
-include (../CMake/fl_create_example.cmake)
+# create data and binary directory to copy scripts and data files
+
+file (MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+file (MAKE_DIRECTORY ${TESTFILE_PATH})
#######################################################################
# audio libs for test apps
@@ -202,17 +207,11 @@ endif (OPTION_BUILD_SHARED_LIBS)
endif (NOT ANDROID)
-# We need some support files for the demo programs:
-
-# Note: this is incomplete as of July 2020
-# Todo: currently all files are copied, but some of them may need configuration:
-# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied)
+#####################################################
+# We need some support files for the demo programs
+#####################################################
-# create data directory for test and demo programs if it doesn't exist
-
-file (MAKE_DIRECTORY ${TESTFILE_PATH})
-
-# copy the test files
+# copy the required test files
file (COPY
demo.menu rgb.txt browser.cxx editor.cxx valuators.fl
@@ -220,6 +219,13 @@ file (COPY
DESTINATION ${TESTFILE_PATH}
)
+# copy the image directory for help_dialog.html
+
+file (COPY
+ ${CMAKE_CURRENT_SOURCE_DIR}/images
+ DESTINATION ${TESTFILE_PATH}
+)
+
# the main test program 'demo' needs additional hints and configurations
target_compile_definitions (demo PRIVATE GENERATED_BY_CMAKE)
diff --git a/test/help_dialog.html b/test/help_dialog.html
index 01809f234..dffaf4cb1 100644
--- a/test/help_dialog.html
+++ b/test/help_dialog.html
@@ -1,5 +1,19 @@
<!--
- Test the Fl_Help_View's ability to parse simple HTML.
+ *
+ * Test file for Fl_Help_View for the Fast Light Tool Kit (FLTK).
+ *
+ * Copyright 1998-2020 by Bill Spitzak and others.
+ *
+ * This library is free software. Distribution and use rights are outlined in
+ * the file "COPYING" which should have been included with this file. If this
+ * file is missing or damaged, see the license at:
+ *
+ * https://www.fltk.org/COPYING.php
+ *
+ * Please see the following page on how to report bugs and issues:
+ *
+ * https://www.fltk.org/bugs.php
+ *
-->
<H1>Simple HTML Tests</H1>
<UL>
@@ -211,16 +225,16 @@ End of DL.
<TR>
<TD>Column 1</TD> <TD>Column 2</TD>
</TR><TR>
- <TD><IMG SRC="../documentation/src/FL200.png"></TD>
+ <TD><IMG SRC="images/FL200.png"></TD>
<TD>This is the FLTK logo</TD>
</TR><TR>
- <TD><IMG SRC="../documentation/src/tiny.png"></TD>
+ <TD><IMG SRC="images/tiny.png"></TD>
<TD>Tiny FLTK logo.</TD>
</TR><TR>
- <TD><IMG SRC="../documentation/src/Fl_Value_Input.png"></TD>
+ <TD><IMG SRC="images/Fl_Value_Input.png"></TD>
<TD>This is an image of Fl_Value_Input</TD>
</TR><TR>
- <TD><IMG SRC="../documentation/src/Fl_Value_Output.png"></TD>
+ <TD><IMG SRC="images/Fl_Value_Output.png"></TD>
<TD>This is an image of Fl_Value_Output</TD>
</TR>
</TABLE>
@@ -237,7 +251,7 @@ This text should be in a paragraph break. This is paragraph #1 of 2.
This text should be in a paragraph break as well. This is paragraph #2 of 2.
<P>
What follows should be a centered image.<BR>
-<IMG SRC="../documentation/src/FL200.png"><BR>
+<IMG SRC="images/FL200.png"><BR>
That should be a centered image.
<P>
</center>
diff --git a/test/images/FL200.png b/test/images/FL200.png
new file mode 100644
index 000000000..b227fc794
--- /dev/null
+++ b/test/images/FL200.png
Binary files differ
diff --git a/test/images/Fl_Value_Input.png b/test/images/Fl_Value_Input.png
new file mode 100644
index 000000000..f555c7059
--- /dev/null
+++ b/test/images/Fl_Value_Input.png
Binary files differ
diff --git a/test/images/Fl_Value_Output.png b/test/images/Fl_Value_Output.png
new file mode 100644
index 000000000..af2f362d0
--- /dev/null
+++ b/test/images/Fl_Value_Output.png
Binary files differ
diff --git a/test/images/tiny.png b/test/images/tiny.png
new file mode 100644
index 000000000..133ecd10e
--- /dev/null
+++ b/test/images/tiny.png
Binary files differ