diff --git a/.travis.yml b/.travis.yml index 66257b34..5a8e2be9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,7 @@ addons: install: - export CXX="g++-5" -- script/configure -D USE_LIBPROFILER=false -script: script/ci +- script/configure + +script: +- script/ci diff --git a/script/configure b/script/configure index 27f33692..f2e511a1 100755 --- a/script/configure +++ b/script/configure @@ -5,15 +5,3 @@ set -e git submodule update --init --recursive externals/gyp/gyp project.gyp --depth . --format=make $@ externals/gyp/gyp tests.gyp --depth . --format=make $@ - -if [ "$1" == "-h" ]; then - cat <<-HELP - -Variables: - --D USE_LIBPROFILER=false - Don't link libprofiler into the test binaries. This flag is needed on systems - where libprofiler (from the google-perftools package) is not installed. - -HELP -fi diff --git a/tests.gyp b/tests.gyp index 04be1fd6..c1960007 100644 --- a/tests.gyp +++ b/tests.gyp @@ -42,14 +42,6 @@ 'ldflags': [ '-g', ], - 'variables': { - 'USE_LIBPROFILER%': 'true', - }, - 'conditions': [ - ['USE_LIBPROFILER != "false"', { - 'libraries': ['-lprofiler'], - }] - ], 'xcode_settings': { 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 'OTHER_LDFLAGS': ['-g'],