Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-10-24 14:53:32 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-10-24 16:37:20 (GMT) |
| commit | f0b7ffcea9b9983555b0555ea5815a193d1e129c (patch) | |
| tree | d3cda9eb667c50665019baa483298b280363f0bb /Swiften/QA | |
| parent | 1c71c5a77e037038c581a68774c96fad9a79030b (diff) | |
| download | swift-f0b7ffcea9b9983555b0555ea5815a193d1e129c.zip swift-f0b7ffcea9b9983555b0555ea5815a193d1e129c.tar.bz2 | |
Honour JID part length in ICUConverter
ICUConverter allowed jidparts greater than 1023 bytes during
stringprep.
The SConscript of StorageTest did not work when libidn had been
disabled, which prevented test=unit from completing.
Test-Information:
Unit tests pass on Debian 9 in a build with ICU and ASan enabled.
Change-Id: I791a09457c6b852e61ce1281871e0f3ca0ce645c
Diffstat (limited to 'Swiften/QA')
| -rw-r--r-- | Swiften/QA/StorageTest/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swiften/QA/StorageTest/SConscript b/Swiften/QA/StorageTest/SConscript index b8360ec..46107a0 100644 --- a/Swiften/QA/StorageTest/SConscript +++ b/Swiften/QA/StorageTest/SConscript @@ -10,7 +10,8 @@ if env["TEST"] : myenv.MergeFlags(myenv["CPPUNIT_FLAGS"]) myenv.MergeFlags(myenv["GOOGLETEST_FLAGS"]) myenv.MergeFlags(myenv["BOOST_FLAGS"]) - myenv.MergeFlags(myenv["LIBIDN_FLAGS"]) + myenv.MergeFlags(myenv.get("LIBIDN_FLAGS", {})) + myenv.MergeFlags(myenv.get("ICU_FLAGS", {})) myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {})) myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {})) myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) |