.travis: use RTLD_NOW for tests

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/.travis.yml b/.travis.yml
index 1425555b124fd38a0c2b6324b384d60afff51818..234edb2d95bd12382d252839e442f1ea0d7389db 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_install:
 
 script:
  - ./bootstrap.sh
- - ./configure --prefix=/usr
+ - CFLAGS='-g -O0 -std=c11 -DDEBUG -DVERBOSE -DRESOLVE_NOW -Wall -Werror' ./configure --prefix=/usr
  - make -j4
  - (cd tests && make tests)
  - echo 1 | sudo tee /sys/fs/cgroup/cpuset/cgroup.clone_children || true

diff --git a/src/lxcfs.c b/src/lxcfs.c
index a6b458371ba8299c6a8a7414aebb95d2e9874e44..94256d43acb173bd295ee7e3e934a960ffa9f039 100644 (file)
--- a/src/lxcfs.c
+++ b/src/lxcfs.c
@@ -127,7 +127,11 @@ static void do_reload(void)
        }
 
        /* First try loading using ld.so */
+#ifdef RESOLVE_NOW
+       dlopen_handle = dlopen("liblxcfs.so", RTLD_NOW);
+#else
        dlopen_handle = dlopen("liblxcfs.so", RTLD_LAZY);
+#endif
        if (dlopen_handle) {
                lxcfs_debug("Opened liblxcfs.so");
                goto good;