Browse code

improved testing

Nat! authored on 06-07-2016 11:15:36
Showing 4 changed files
... ...
@@ -16,5 +16,10 @@ tests/compare-parse-speed-to-unarchive-speed.sh
16 16
 .bootstrap.auto/
17 17
 .bootstrap.local/
18 18
 dependencies/
19
+/include
20
+/lib
21
+/bin
19 22
 .repos/
20 23
 mulle-configuration/
24
+.repos/mulle-thread/mintomic/
25
+.repos/mulle-thread/mulle-configuration/
... ...
@@ -176,6 +176,7 @@ MulleScion
176 176
 ${FOUNDATION}
177 177
 ${END_ALL_LOAD}
178 178
 ${OS_SPECIFIC_LIBS}
179
+-lz
179 180
 )
180 181
 
181 182
 
... ...
@@ -4,9 +4,7 @@ set -e
4 4
 
5 5
 cd ..
6 6
    mulle-bootstrap build  -c Debug -k "$@"
7
-   mulle-bootstrap install "`pwd`"
8 7
 
9 8
 cd build
10 9
    cmake -DCMAKE_OSX_SYSROOT=macosx -DCMAKE_INSTALL_PREFIX="`pwd`/.." -DCMAKE_BUILD_TYPE=Debug ..
11
-   make install
12
-
10
+   make -j 4 install
... ...
@@ -38,7 +38,16 @@ trap trace_ignore 5 6
38 38
 
39 39
 # parse optional parameters
40 40
 exe=`ls -1 ../bin/mulle-scion 2> /dev/null | tail -1`
41
+if [ ! -x "${exe}" ]
42
+then
43
+   exe=`ls -1 ../?uild/Products/*/mulle-scion 2> /dev/null | tail -1`
44
+   if [ ! -x "${exe}" ]
45
+   then
46
+      exe=`ls -1 ../?uild/*/mulle-scion | tail -1 2> /dev/null`
47
+   fi
48
+fi
41 49
 
50
+ 
42 51
 if [ -x "${exe}" ]
43 52
 then
44 53
    MULLE_SCION="${1:-${exe}}"
... ...
@@ -339,7 +348,7 @@ test_binary()
339 348
 
340 349
    if [ $code -eq 127 ]
341 350
    then
342
-      echo "mulle-scion can not be found" >&2
351
+      echo "mulle-scion can not be run (missing shared library probably)" >&2
343 352
       exit 1
344 353
    fi
345 354
 
... ...
@@ -371,10 +380,9 @@ case "`uname`" in
371 380
       DYLD_FALLBACK_FRAMEWORK_PATH="`pwd`/../dependencies/Frameworks/Debug"
372 381
       export DYLD_FALLBACK_FRAMEWORK_PATH
373 382
       ;;
374
-
375
-   *) 
376
-      path="`dirname "${MULLE_SCION}"`"
377
-      LD_LIBRARY_PATH="`dirname "${path}"`/lib:${LD_LIBRARY_PATH}"
383
+ 
384
+   *)
385
+      LD_LIBRARY_PATH="`pwd`/../dependencies/lib:${LD_LIBRARY_PATH}"
378 386
       export LD_LIBRARY_PATH
379 387
       ;;
380 388
 esac