From cba0d1993fb16e77b74c9d9ef240f817aa8dc6ba Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Mon, 23 Oct 2017 17:48:11 +0900 Subject: Move scripts to test directory This scripts are not needed anymore They were used for testing [Pach Sets 2] Add tests directory After discussing, it became better to leave the test script. Then, rename the directory name from "scripts" to "tests". Move the test script to "tests" directory. Change-Id: I072b1087ef4804ae6877bb2c864a94da799141f1 Signed-off-by: Kazumasa Mitsunari --- CMakeLists.txt | 1 - scripts/CMakeLists.txt | 5 ---- scripts/wm-request | 74 -------------------------------------------------- tests/wm-request | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 80 deletions(-) delete mode 100644 scripts/CMakeLists.txt delete mode 100644 scripts/wm-request create mode 100644 tests/wm-request diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b2d47b..2d25e73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,6 @@ set(SANITIZER_MODE "none" CACHE STRING "Build using a specific sanitizer (e.g. ' set(LINK_LIBCXX OFF CACHE BOOL "Link against LLVMs libc++") -add_subdirectory(scripts) add_subdirectory(src) install( diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt deleted file mode 100644 index 4dda1ce..0000000 --- a/scripts/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -install( - FILES wm-request - DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE - COMPONENT "runtime") diff --git a/scripts/wm-request b/scripts/wm-request deleted file mode 100644 index e7ecb87..0000000 --- a/scripts/wm-request +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -# -# Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -nopygments=0 -if [ "$1" = "-p" ] -then - nopygments=1 - shift -fi - -if ! [ "$1" ] -then - echo "Usage: $0 VERB [ARGS]" >&2 - exit 1 -fi - -UUIDFILE=/tmp/wm-request-uuid -if ! which uuidgen 2>/dev/null 1>&2 -then - echo "c7c638c5-d097-4eb4-9012-a1e4c25b9808" > $UUIDFILE -else - if ! [ -f $UUIDFILE ] - then - uuidgen > $UUIDFILE - fi -fi -UUID="`cat $UUIDFILE`" - -for i in afb-client-demo -do - which $i 2>/dev/null 1>&2 || { echo "Program $i is missing" >&2; exit 1; } -done - -set -eu - - if [ $nopygments = 0 ] && which pygmentize 2>/dev/null 1>&2 - then - json_pretty() { - pygmentize -l json - } - else - json_pretty() { - cat - } -fi - -verb=$1 -shift - -set +u -if [ "$1" ] -then - set -u - args='{"drawing_name":"'"$1"'"}' -fi - -afb-client-demo -H ws://localhost:1700/api\?token=wm\&uuid=$UUID windowmanager $verb $args | json_pretty - -# vim:set ft=sh: diff --git a/tests/wm-request b/tests/wm-request new file mode 100644 index 0000000..fade547 --- /dev/null +++ b/tests/wm-request @@ -0,0 +1,74 @@ +#!/bin/sh + +# +# Copyright (c) 2017 TOYOTA MOTOR CORPORATION +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +nopygments=0 +if [ "$1" = "-p" ] +then + nopygments=1 + shift +fi + +if ! [ "$1" ] +then + echo "Usage: $0 VERB [ARGS]" >&2 + exit 1 +fi + +UUIDFILE=/tmp/wm-request-uuid +if ! which uuidgen 2>/dev/null 1>&2 +then + echo "c7c638c5-d097-4eb4-9012-a1e4c25b9808" > $UUIDFILE +else + if ! [ -f $UUIDFILE ] + then + uuidgen > $UUIDFILE + fi +fi +UUID="`cat $UUIDFILE`" + +for i in afb-client-demo +do + which $i 2>/dev/null 1>&2 || { echo "Program $i is missing" >&2; exit 1; } +done + +set -eu + + if [ $nopygments = 0 ] && which pygmentize 2>/dev/null 1>&2 + then + json_pretty() { + pygmentize -l json + } + else + json_pretty() { + cat + } +fi + +verb=$1 +shift + +set +u +if [ "$1" ] +then + set -u + args='{"drawing_name":"'"$1"'"}' +fi + +afb-client-demo -H ws://localhost:1700/api\?token=wm\&uuid=$UUID windowmanager $verb $args | json_pretty + +# vim:set ft=sh: -- cgit 1.2.3-korg