diff options
Diffstat (limited to 'php')
40 files changed, 65 insertions, 629 deletions
diff --git a/php/allTests.py b/php/allTests.py index 60ee9dcb52a..e4360c465d3 100755 --- a/php/allTests.py +++ b/php/allTests.py @@ -8,44 +8,9 @@ # # ********************************************************************** -import os, sys, re, getopt +import os, sys +sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts")) -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") +from Util import runTestsWithPath -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -# -# List of all basic tests. -# -tests = [ - ("Ice/proxy", ["core"]), - ("Ice/operations", ["core"]), - ("Ice/exceptions", ["core"]), - ("Ice/info", ["core", "noipv6", "nocompress"]), - ("Ice/inheritance", ["core"]), - ("Ice/binding", ["core"]), - ("Ice/checksum", ["core"]), - ("Ice/facets", ["core"]), - ("Ice/objects", ["core"]), - ("Ice/slicing/exceptions", ["core"]), - ("Ice/slicing/objects", ["core"]), - ("Ice/defaultValue", ["core"]), - ("Ice/optional", ["core"]), - ("Ice/enums", ["core"]), - ("Ice/ini", ["once"]), - ("Ice/scope", ["once"]), - ("Ice/acm", ["once"]), - ("Slice/keyword", ["once"]), - ("Slice/structure", ["once"]), - ("Slice/macros", ["once"]), - ] - -if __name__ == "__main__": - TestUtil.run(tests) +runTestsWithPath(__file__)
\ No newline at end of file diff --git a/php/test/Ice/acm/Client.php b/php/test/Ice/acm/Client.php index 6a0a63dfa52..33a6d44f27f 100644 --- a/php/test/Ice/acm/Client.php +++ b/php/test/Ice/acm/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/acm/run.py b/php/test/Ice/acm/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/php/test/Ice/acm/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/php/test/Ice/binding/Client.php b/php/test/Ice/binding/Client.php index 3b3c376f033..814512273c1 100644 --- a/php/test/Ice/binding/Client.php +++ b/php/test/Ice/binding/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/binding/run.py b/php/test/Ice/binding/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/php/test/Ice/binding/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/php/test/Ice/checksum/Client.php b/php/test/Ice/checksum/Client.php index a14cbe4da01..2e44d569e63 100644 --- a/php/test/Ice/checksum/Client.php +++ b/php/test/Ice/checksum/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/checksum/run.py b/php/test/Ice/checksum/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/php/test/Ice/checksum/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/php/test/Ice/defaultValue/Client.php b/php/test/Ice/defaultValue/Client.php index 2fcc596ce0f..a6abc453b18 100644 --- a/php/test/Ice/defaultValue/Client.php +++ b/php/test/Ice/defaultValue/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/defaultValue/run.py b/php/test/Ice/defaultValue/run.py deleted file mode 100755 index e981ac9ac91..00000000000 --- a/php/test/Ice/defaultValue/run.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -testdir = os.getcwd() - -client = os.path.join(testdir, "Client.php") - -sys.stdout.write("starting client... ") -sys.stdout.flush() -clientProc = TestUtil.startClient(client, startReader = False) -print("ok") -clientProc.startReader() -clientProc.waitTestSuccess() diff --git a/php/test/Ice/enums/Client.php b/php/test/Ice/enums/Client.php index 4ce07324735..8dd7f336bed 100644 --- a/php/test/Ice/enums/Client.php +++ b/php/test/Ice/enums/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/enums/run.py b/php/test/Ice/enums/run.py deleted file mode 100755 index 3aac7a1c45a..00000000000 --- a/php/test/Ice/enums/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("Running test with 1.1 encoding.") -TestUtil.clientServerTest() diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php index 4b6c29f5ae1..eaa48484621 100644 --- a/php/test/Ice/exceptions/Client.php +++ b/php/test/Ice/exceptions/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/exceptions/run.py b/php/test/Ice/exceptions/run.py deleted file mode 100755 index 9c5846ff6b0..00000000000 --- a/php/test/Ice/exceptions/run.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() - -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") - -print("Running test with compact (default) format and AMD server.") -TestUtil.clientServerTest(server="serveramd") - -print("Running test with sliced format and AMD server.") -TestUtil.clientServerTest(server="serveramd", - additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding and AMD server.") -TestUtil.clientServerTest(server="serveramd", - additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/php/test/Ice/facets/Client.php b/php/test/Ice/facets/Client.php index d4a8d306ee5..2fb5d397218 100644 --- a/php/test/Ice/facets/Client.php +++ b/php/test/Ice/facets/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/facets/run.py b/php/test/Ice/facets/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/php/test/Ice/facets/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/php/test/Ice/info/Client.php b/php/test/Ice/info/Client.php index c17d3cc819b..f8b8c91fb1a 100644 --- a/php/test/Ice/info/Client.php +++ b/php/test/Ice/info/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/info/run.py b/php/test/Ice/info/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/php/test/Ice/info/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/php/test/Ice/inheritance/Client.php b/php/test/Ice/inheritance/Client.php index 50a544c2752..0472ef426ca 100644 --- a/php/test/Ice/inheritance/Client.php +++ b/php/test/Ice/inheritance/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/inheritance/run.py b/php/test/Ice/inheritance/run.py deleted file mode 100755 index 3fc6200cd00..00000000000 --- a/php/test/Ice/inheritance/run.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.clientServerTest() diff --git a/php/test/Ice/ini/run.py b/php/test/Ice/ini/run.py deleted file mode 100755 index 5dea6040b0e..00000000000 --- a/php/test/Ice/ini/run.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -testdir = os.getcwd() - -client = os.path.join(testdir, "Client.php") -sys.stdout.write("testing php INI settings... ") -sys.stdout.flush() -clientProc = TestUtil.startClient(client, startReader = False, clientConfig = True, iceOptions = "--Ice.Trace.Network=1 --Ice.Warn.Connections=1") -clientProc.startReader() -clientProc.waitTestSuccess() -print("ok") - -client = os.path.join(testdir, "ClientWithProfile.php") -sys.stdout.write("testing php INI settings with profiles... ") -sys.stdout.flush() -clientProc = TestUtil.startClient(client, startReader = False, clientConfig = True, iceOptions = "--Ice.Trace.Network=1 --Ice.Warn.Connections=1", iceProfile="Test") -clientProc.startReader() -clientProc.waitTestSuccess() -print("ok") diff --git a/php/test/Ice/ini/test.py b/php/test/Ice/ini/test.py new file mode 100644 index 00000000000..54f63434953 --- /dev/null +++ b/php/test/Ice/ini/test.py @@ -0,0 +1,43 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +class IniClient(Client): + + def __init__(self, iceOptions, iceProfile=None, *args, **kargs): + Client.__init__(self, *args, **kargs) + self.iceOptions = iceOptions + self.iceProfile = iceProfile + + def setup(self, current): + if self.iceProfile: + current.testcase.createFile("ice.profiles", [ + "[%s]" % self.iceProfile, + "ice.config=\"config.client\"", + "ice.options=\"%s\"" % self.iceOptions, + ]) + current.write("testing... ") + + def teardown(self, current, success): + if success: + current.writeln("ok") + + def getPhpArgs(self, current): + if self.iceProfile: + return ["-d", "ice.profiles='ice.profiles'"] + else: + return ["-d", "ice.options='{0}'".format(self.iceOptions), "-d", "ice.config='config.client'"] + +TestSuite(__name__, [ + ClientTestCase("php INI settings", + client=IniClient("--Ice.Trace.Network=1 --Ice.Warn.Connections=1")), + ClientTestCase("php INI settings with profiles", + client=IniClient("--Ice.Trace.Network=1 --Ice.Warn.Connections=1", + "Test", + exe="ClientWithProfile.php")) +])
\ No newline at end of file diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php index 76c777c80f6..b7c0b2dc4a1 100644 --- a/php/test/Ice/objects/Client.php +++ b/php/test/Ice/objects/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/objects/run.py b/php/test/Ice/objects/run.py deleted file mode 100755 index 1361b69d666..00000000000 --- a/php/test/Ice/objects/run.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() - -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", - additionalServerOptions="--Ice.Default.SlicedFormat") - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/php/test/Ice/operations/Client.php b/php/test/Ice/operations/Client.php index fda181bd28c..a2667a05a44 100644 --- a/php/test/Ice/operations/Client.php +++ b/php/test/Ice/operations/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/operations/run.py b/php/test/Ice/operations/run.py deleted file mode 100755 index 6e58b0fc7fd..00000000000 --- a/php/test/Ice/operations/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with AMD server.") -TestUtil.clientServerTest(server="serveramd") diff --git a/php/test/Ice/optional/Client.php b/php/test/Ice/optional/Client.php index 336497ae988..1393b8ee9ab 100644 --- a/php/test/Ice/optional/Client.php +++ b/php/test/Ice/optional/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/optional/run.py b/php/test/Ice/optional/run.py deleted file mode 100755 index 95f8e4badb7..00000000000 --- a/php/test/Ice/optional/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with compact (default) format.") -TestUtil.clientServerTest() -print("Running test with sliced format.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat", additionalServerOptions="--Ice.Default.SlicedFormat") diff --git a/php/test/Ice/proxy/Client.php b/php/test/Ice/proxy/Client.php index 987a8c792a6..54ccb759d07 100644 --- a/php/test/Ice/proxy/Client.php +++ b/php/test/Ice/proxy/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Ice/proxy/run.py b/php/test/Ice/proxy/run.py deleted file mode 100755 index 6e58b0fc7fd..00000000000 --- a/php/test/Ice/proxy/run.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("tests with regular server.") -TestUtil.clientServerTest() -print("tests with AMD server.") -TestUtil.clientServerTest(server="serveramd") diff --git a/php/test/Ice/scope/run.py b/php/test/Ice/scope/run.py deleted file mode 100755 index 239932348c2..00000000000 --- a/php/test/Ice/scope/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -testdir = os.getcwd() - -client = os.path.join(testdir, "Client.php") -clientProc = TestUtil.startClient(client, startReader = False) -clientProc.startReader() -clientProc.waitTestSuccess() diff --git a/php/test/Ice/slicing/exceptions/Client.php b/php/test/Ice/slicing/exceptions/Client.php index db410f4366a..923a167ade9 100644 --- a/php/test/Ice/slicing/exceptions/Client.php +++ b/php/test/Ice/slicing/exceptions/Client.php @@ -1,4 +1,4 @@ -<? +<?php error_reporting(E_ALL | E_STRICT); if(!extension_loaded("ice")) diff --git a/php/test/Ice/slicing/exceptions/run.py b/php/test/Ice/slicing/exceptions/run.py deleted file mode 100755 index d27134b1154..00000000000 --- a/php/test/Ice/slicing/exceptions/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with sliced format.") -TestUtil.clientServerTest() - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/php/test/Ice/slicing/objects/Client.php b/php/test/Ice/slicing/objects/Client.php index 351af5437da..ba00029a2d6 100644 --- a/php/test/Ice/slicing/objects/Client.php +++ b/php/test/Ice/slicing/objects/Client.php @@ -1,4 +1,4 @@ -<? +<?php error_reporting(E_ALL | E_STRICT); if(!extension_loaded("ice")) diff --git a/php/test/Ice/slicing/objects/run.py b/php/test/Ice/slicing/objects/run.py deleted file mode 100755 index d27134b1154..00000000000 --- a/php/test/Ice/slicing/objects/run.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -print("Running test with sliced format.") -TestUtil.clientServerTest() - -print("Running test with 1.0 encoding.") -TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0", - additionalServerOptions="--Ice.Default.EncodingVersion=1.0") diff --git a/php/test/Slice/keyword/Client.php b/php/test/Slice/keyword/Client.php index 84da5378948..b512e5a3b2d 100644 --- a/php/test/Slice/keyword/Client.php +++ b/php/test/Slice/keyword/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Slice/keyword/run.py b/php/test/Slice/keyword/run.py deleted file mode 100755 index e981ac9ac91..00000000000 --- a/php/test/Slice/keyword/run.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -testdir = os.getcwd() - -client = os.path.join(testdir, "Client.php") - -sys.stdout.write("starting client... ") -sys.stdout.flush() -clientProc = TestUtil.startClient(client, startReader = False) -print("ok") -clientProc.startReader() -clientProc.waitTestSuccess() diff --git a/php/test/Slice/macros/Client.php b/php/test/Slice/macros/Client.php index a8e16923446..d120e2e3dcb 100644 --- a/php/test/Slice/macros/Client.php +++ b/php/test/Slice/macros/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Slice/macros/run.py b/php/test/Slice/macros/run.py deleted file mode 100755 index e981ac9ac91..00000000000 --- a/php/test/Slice/macros/run.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -testdir = os.getcwd() - -client = os.path.join(testdir, "Client.php") - -sys.stdout.write("starting client... ") -sys.stdout.flush() -clientProc = TestUtil.startClient(client, startReader = False) -print("ok") -clientProc.startReader() -clientProc.waitTestSuccess() diff --git a/php/test/Slice/structure/Client.php b/php/test/Slice/structure/Client.php index 03cb6476c8b..a481ffe48dd 100644 --- a/php/test/Slice/structure/Client.php +++ b/php/test/Slice/structure/Client.php @@ -1,4 +1,4 @@ -<? +<?php // ********************************************************************** // // Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. diff --git a/php/test/Slice/structure/run.py b/php/test/Slice/structure/run.py deleted file mode 100755 index e981ac9ac91..00000000000 --- a/php/test/Slice/structure/run.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -testdir = os.getcwd() - -client = os.path.join(testdir, "Client.php") - -sys.stdout.write("starting client... ") -sys.stdout.flush() -clientProc = TestUtil.startClient(client, startReader = False) -print("ok") -clientProc.startReader() -clientProc.waitTestSuccess() |