Test for bundled libraries like libjpeg,libpng, ICU #1036
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
annulen
reviewed
Oct 15, 2020
tests/webkitwidgets/CMakeLists.txt
Outdated
| @@ -59,7 +60,7 @@ foreach (testName ${QtWK1ApiTests}) | |||
| add_executable(tst_${testName} ${tst_${testName}_SOURCES}) | |||
| target_include_directories(tst_${testName} PRIVATE ${testName}) | |||
| target_link_libraries(tst_${testName} ${QtWK1ApiTests_LIBRARIES}) | |||
| set_target_properties(tst_${testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${QtWK1ApiTests_RUNTIME_OUTPUT_DIRECTORY} AUTOMOC ON) | |||
| set_target_properties(tst_${testName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${CMAKE_BUILD_TYPE_UPPER} ${QtWK1ApiTests_RUNTIME_OUTPUT_DIRECTORY} AUTOMOC ON) | |||
There was a problem hiding this comment.
Some CMake generators (e.g. Visual Studio, Ninja Multi-Config) support multiple build types in one build, so this way is not correct. I think we need something like
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
like e.g. in OptionsWin.cmake
| { | ||
| QString html("<html>" | ||
| "<body>" | ||
| "<img src='qrc:///image.jpg'>" |
There was a problem hiding this comment.
AFAIK <html> and <body> will be added automatically if you just use "<img src='qrc:///image.jpg'>"
There was a problem hiding this comment.
I think the browser itself adds those tags by default not only for qrc. So yeah I will fix this.
|
|
||
| void tst_Libjpeg::decodeAndCompare() | ||
| { | ||
| QString html("<html>" |
RAJAGOPALAN-GANGADHARAN
force-pushed
the
libtest
branch
from
4251981
to
de2e41b
Compare
|
Looks good! Now you can proceed with other tests |
RAJAGOPALAN-GANGADHARAN
force-pushed
the
libtest
branch
from
de2e41b
to
cf215db
Compare
RAJAGOPALAN-GANGADHARAN
force-pushed
the
libtest
branch
from
2057c3f
to
480b9eb
Compare
annulen
reviewed
Nov 5, 2020
|
|
||
| void tst_Libjpeg::cleanupTestCase() | ||
| { | ||
| } |
There was a problem hiding this comment.
No need to have empty constructors, init/cleanup
| QVariant res = page.mainFrame()->evaluateJavaScript("res"); | ||
| QCOMPARE(res.toString(), QStringLiteral("Database Success")); | ||
|
|
||
| page.mainFrame()->evaluateJavaScript("add('1','Name1')"); |
RAJAGOPALAN-GANGADHARAN
force-pushed
the
libtest
branch
from
480b9eb
to
32359e8
Compare
RAJAGOPALAN-GANGADHARAN
force-pushed
the
libtest
branch
from
814be06
to
19e13e2
Compare
|
Runtime_output_directory_<config> takes precedence over Runtime_output_directory So binary of tests for windows are ending up in wrong folder. Tests goes to right dir in case of multi-config gen
RAJAGOPALAN-GANGADHARAN
force-pushed
the
libtest
branch
from
ab223f9
to
20c851d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.