From c333012a5d1d4400eb68bb0f680f9bd93a13dede Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Thu, 12 Mar 2015 15:56:14 +0100 Subject: [PATCH] Restore run-layout-test script into working condition. We shuld probably start caring about running layout tests. This commit makes it possible to do it one again after the refactoring branch changes. It also makes sure tools needed by layout tests are build togeter with content_shell app. Change-Id: Id5db5b72ece5e547684bf0e932349352a039355a Signed-off-by: Piotr Tworek --- tizen_src/build/common.sh | 2 +- tizen_src/scripts/run-layout-tests | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh index 30c5884..04277f4 100755 --- a/tizen_src/build/common.sh +++ b/tizen_src/build/common.sh @@ -142,7 +142,7 @@ function hostNinja() { TARGETS="$TARGETS ewk_unittests" fi if [[ $BUILD_CONTENT_SHELL == 1 ]]; then - TARGETS="$TARGETS content_shell" + TARGETS="$TARGETS content_shell dump_syms minidump_stackwalk" fi if [[ $BUILD_XWALK == 1 ]]; then TARGETS="$TARGETS xwalk" diff --git a/tizen_src/scripts/run-layout-tests b/tizen_src/scripts/run-layout-tests index 784eab5..08be9fe 100755 --- a/tizen_src/scripts/run-layout-tests +++ b/tizen_src/scripts/run-layout-tests @@ -1,7 +1,7 @@ #!/bin/bash _script=$(readlink -f $0) -_top_dir=$(dirname $_script)/.. -_runner=$_top_dir/src/third_party/WebKit/Tools/Scripts/run-webkit-tests +_top_dir=$(dirname $_script)/../.. +_runner=$_top_dir/third_party/WebKit/Tools/Scripts/run-webkit-tests _out="out.x64" echo $@ | grep -q \\-\\-help && $_runner --help @@ -9,8 +9,8 @@ echo $@ | grep -q \\-\\-help && $_runner --help echo $@ | grep -q \\-\\-debug [ $? -gt 0 ] && _mode="Release" || _mode="Debug" -if [ ! -x $_top_dir/$_out/$_mode/content_shell_efl ]; then - echo "Please build content_shell_efl in $_mode mode first" +if [ ! -x $_top_dir/$_out/$_mode/content_shell ]; then + echo "Please build content_shell in $_mode mode first" exit 1 fi @@ -31,13 +31,9 @@ CHROMIUM_EFL_DEPENDENCIES_LIBDIR=$BUILDDIR/../Dependencies/Root/$_LIBDIR export LD_LIBRARY_PATH=$CHROMIUM_EFL_DEPENDENCIES_LIBDIR:$CHROMIUM_EFL_LIBDIR:${LD_LIBRARY_PATH} echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" -# The test runner expects driver binary to be called content_shell. -ln -f $_top_dir/$_out/$_mode/content_shell_efl \ - $_top_dir/$_out/$_mode/content_shell - exec $_runner \ --additional-env-var=EVAS_GL_NO_BLACKLIST=1 \ - --additional-expectations=$_top_dir/src/third_party/WebKit/LayoutTests/platform/tizen/TestExpectations \ + --additional-expectations=$_top_dir/third_party/WebKit/LayoutTests/platform/tizen/TestExpectations \ --build-directory=$_top_dir/out.x64 \ --additional-drt-flag=--no-sandbox \ --additional-drt-flag=--ignore-gpu-blacklist \ -- 2.7.4