~ubuntu-branches/ubuntu/precise/cctools/precise

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
From: Michael Hanke <mih@debian.org>
Subject: Allow tests to run as root

Packages get built by root, and chirp refused to start as root without
additional argueing.

--- a/chirp/test/TR_001_chirp_benchmark.sh
+++ b/chirp/test/TR_001_chirp_benchmark.sh
@@ -9,7 +9,11 @@
 prepare()
 {
     port=`find_free_port`
-    ../src/chirp_server -p $port &
+    if [ `id -u` -eq 0 ]; then
+        ../src/chirp_server -i $USER -p $port &
+    else
+        ../src/chirp_server -p $port &
+    fi
     pid=$!
     
     echo $port> $PORT_FILE
--- a/chirp/test/TR_002_chirp_ops.sh
+++ b/chirp/test/TR_002_chirp_ops.sh
@@ -11,7 +11,11 @@
     mkdir foo
     ln -s ..//.//./..///foo/ foo/foo
     port=`find_free_port`
-    ../src/chirp_server -r $PWD/foo -p $port &
+    if [ `id -u` -eq 0 ]; then
+        ../src/chirp_server -i $USER -r $PWD/foo -p $port &
+    else
+        ../src/chirp_server -r $PWD/foo -p $port &
+    fi
     echo $! > $PID_FILE
     echo $port > $PORT_FILE
     exit 0