summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-02-12 12:18:02 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-02-16 16:47:07 (GMT)
commit45eec1d00d5b9fabee1ce44f7dd8addd7d0cf6b3 (patch)
tree5483798e909c8d552acdcb73d114fe3f1ee73534 /Swiften/QA/FileTransferTest/SConscript
parent40d02d4969bb4fd3c0ec8a6268df1b87c6b9e667 (diff)
downloadswift-45eec1d00d5b9fabee1ce44f7dd8addd7d0cf6b3.zip
swift-45eec1d00d5b9fabee1ce44f7dd8addd7d0cf6b3.tar.bz2
Run FileTransferTest correctly as part of the system integration tests
If Scons is configured to run system unit tests, it will run FileTransferTest and test for working IBB transfer, direct S5B transfer and proxied S5B transfer. Test-Information: Tested ./scons test=all is working on Linux and OS X. Change-Id: Id70c9e1e9db9c897d9bfc7dd03b874afe5262207
Diffstat (limited to 'Swiften/QA/FileTransferTest/SConscript')
-rw-r--r--Swiften/QA/FileTransferTest/SConscript3
1 files changed, 3 insertions, 0 deletions
diff --git a/Swiften/QA/FileTransferTest/SConscript b/Swiften/QA/FileTransferTest/SConscript
index d17b12a..3275985 100644
--- a/Swiften/QA/FileTransferTest/SConscript
+++ b/Swiften/QA/FileTransferTest/SConscript
@@ -13,5 +13,8 @@ if env["TEST"] :
elif os.environ.get(i, "") :
myenv["ENV"][i] = os.environ[i]
+ # test in-band transfers, direct SOCKS5 bytestream transfers and proxied SOCKS5 bytestream transfers
+ myenv["ENV"]["SWIFT_FILETRANSFERTEST_CONFIG"] = "1:1|2:2|4:4"
+
tester = myenv.Program("FileTransferTest", ["FileTransferTest.cpp"])
myenv.Test(tester, "system")