X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Ftoolchain-test;h=cf8fa58e18231a416a49f2ab93d96e2cd12f9179;hb=d93443fd15258fa1e553233d64efcd91be89ab18;hp=e169c69955f1e136fe28a5398a6518bbc63b2d8e;hpb=b5bfb2006502b57fab234345a2393fd04e6d55ad;p=hvlinux.git

diff --git a/stage2/toolchain-test b/stage2/toolchain-test
index e169c69..cf8fa58 100755
--- a/stage2/toolchain-test
+++ b/stage2/toolchain-test
@@ -1,17 +1,14 @@
 #!/bin/bash
-set -o errexit
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
+source ../functions/main
 
 # Testing toolchain
 cd /tmp
 echo 'main(){}' > dummy.c
 gcc dummy.c -Wl,--verbose &> dummy.log
 
-if ! readelf -l a.out | grep 'Requesting program interpreter: /lib/ld-linux.*.so.2' 1> /dev/null 2>&1 ; then
+if ! readelf -l a.out | \
+    grep -q 'Requesting program interpreter: /lib/ld-linux.*.so.2'; then
     echo "String 'Requesting program interpreter: /lib/ld-linux.*.so.2' not found"
     exit 1
 fi