1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
--- scripts/TestUtil.py.orig 2016-10-05 16:59:08.000000000 +0200
+++ scripts/TestUtil.py 2016-10-11 23:30:25.933993909 +0200
@@ -145,6 +145,25 @@
def iceUseOpenSSL():
return any(sys.platform.startswith(p) for p in ["linux", "freebsd"])
+def isFreeBSD():
+ return sys.platform.startswith("freebsd")
+
+def sysctl(key):
+ p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE)
+ try:
+ result = p.communicate()[0].strip().split()[1]
+ except IndexError:
+ return 0
+ if sys.version_info >= (3,):
+ result = str(result, sys.stdout.encoding)
+ try:
+ return int(result)
+ except ValueError:
+ return result
+
+def isFreeBSDJail():
+ return isFreeBSD() and sysctl("security.jail.jailed")
+
def getCppCompiler():
compiler = ""
if os.environ.get("CPP_COMPILER", "") != "":
@@ -340,7 +359,7 @@
print("uname failed:\n" + p.stdout.read().strip())
sys.exit(1)
line = p.stdout.readline().decode('UTF-8').strip()
- if line == "x86_64" and os.environ.get("LP64", "") != "no":
+ if line in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no":
x64 = True
elif line == "armv7l":
armv7l = True
@@ -2013,7 +2032,7 @@
addLdPath(getCppLibDir(lang), env)
elif isAIX():
addLdPath(getCppLibDir(lang), env)
- elif lang in ["python", "ruby", "php", "js", "objective-c"]:
+ elif lang in ["cpp", "python", "ruby", "php", "js", "objective-c"]:
# C++ binaries use rpath $ORIGIN or similar to find the Ice libraries
addLdPath(getCppLibDir(lang), env)
@@ -2366,6 +2385,14 @@
print("%s*** test not supported under Yocto%s" % (prefix, suffix))
continue
+ if isFreeBSD() and "nofreebsd" in config:
+ print("%s*** test not supported under FreeBSD%s" % (prefix, suffix))
+ continue
+
+ if isFreeBSDJail() and "nofreebsdjail" in config:
+ print("%s*** test not supported within a FreeBSD Jail%s" % (prefix, suffix))
+ continue
+
if not isWin32() and "win32only" in config:
print("%s*** test only supported under Win32%s" % (prefix, suffix))
continue
|
