test exec: remove git2go and cloning afb-helloworld

replace it by fixtures in test/helloworld and copying repo to
XDS_SERVER_ROOT_CFG_DIR and cloning app-templates repo into it

Change-Id: I4f3d9cfae0f1b81bd7994e172235b1fbc25fd383
Signed-off-by: Clément Bénier <clement.benier@iot.bzh>

diff --git a/glide.yaml b/glide.yaml
index eae47ea..69ee318 100644 (file)
--- a/glide.yaml
+++ b/glide.yaml
@@ -39,5 +39,3 @@ import:
   - assert
 - package: github.com/sebd71/go-socket.io-client
   version: 46defcb47f
-- package: github.com/libgit2/git2go
-  version: v27

diff --git a/test/config.go b/test/config.go
index a551d4f..4850919 100644 (file)
--- a/test/config.go
+++ b/test/config.go
@@ -29,4 +29,5 @@ const (
        envXdsServerRootCfgDir   = "XDS_SERVER_ROOT_CFG_DIR"
        sdkFileName              = "poky-agl-glibc-x86_64-gcc_crosssdk-native_x86_64-toolchain-1.0.2.sh"
        sdkFile                  = "fixtures/" + sdkFileName
+       helloworldFixturesDir    = "fixtures/helloworld"
 )

diff --git a/test/exec_test.go b/test/exec_test.go
index 5d4c106..f2d48ce 100644 (file)
--- a/test/exec_test.go
+++ b/test/exec_test.go
@@ -17,17 +17,29 @@
 package xdsservertest
 
 import (
-       "log"
+       "bytes"
        "os"
+       "os/exec"
        "path"
        "testing"
        "time"
 
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
-       git "github.com/libgit2/git2go"
        "github.com/stretchr/testify/assert"
 )
 
+func InitExec(t *testing.T) string {
+       helloworldDir := path.Join(os.Getenv(envRootCfgDir), "helloworld")
+       cmd := exec.Command("cp", "-r", helloworldFixturesDir, helloworldDir)
+       var out bytes.Buffer
+       cmd.Stdout = &out
+       assert.Nil(t, cmd.Run())
+       subHelloworldAppTemplateDir := path.Join(helloworldDir, "conf.d", "app-templates")
+       cmd = exec.Command("git", "clone", "https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git", subHelloworldAppTemplateDir)
+       assert.Nil(t, cmd.Run())
+       return helloworldDir
+}
+
 /*flush channel with timeout*/
 func flushChannelExec(channel chan xsapiv1.ExecOutMsg, ms time.Duration) {
        timeoutB := false
@@ -40,31 +52,7 @@ func flushChannelExec(channel chan xsapiv1.ExecOutMsg, ms time.Duration) {
        }
 }
 func TestExec(t *testing.T) {
-       cloneRepo := "https://github.com/iotbzh/helloworld-service.git"
-       cloneDir := path.Join(os.Getenv(envRootCfgDir), "testExec")
-       t.Logf("Cloning repo %v in %v\n...\n", cloneRepo, cloneDir)
-       var cloneOptions git.CloneOptions
-       repository, err := git.Clone(cloneRepo, cloneDir, &cloneOptions)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       repository.Submodules.Foreach(func(sub *git.Submodule, name string) int {
-               sub.Init(true)
-               err := sub.Update(true, &git.SubmoduleUpdateOptions{
-                       &git.CheckoutOpts{
-                               Strategy: git.CheckoutForce | git.CheckoutUpdateSubmodules,
-                       },
-                       &git.FetchOptions{},
-               })
-               if err != nil {
-                       log.Fatal(err)
-               }
-               return 0
-
-       })
-
-       t.Logf("repo cloned\n")
+       helloworldDir := InitExec(t)
 
        var cfgArray []xsapiv1.FolderConfig
        assert.Nil(t, HTTPCli.Get("/folders", &cfgArray))
@@ -72,11 +60,11 @@ func TestExec(t *testing.T) {
 
        fPrj := xsapiv1.FolderConfig{
                Label:      "testproject",
-               ClientPath: cloneDir,
+               ClientPath: helloworldDir,
                Type:       xsapiv1.TypePathMap,
                ClientData: "clientdatatest",
                DataPathMap: xsapiv1.PathMapConfig{
-                       ServerPath: cloneDir,
+                       ServerPath: helloworldDir,
                },
        }
        var cfg xsapiv1.FolderConfig
@@ -89,9 +77,7 @@ func TestExec(t *testing.T) {
                chExec <- ev
        })
 
-       cmd := "export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig/"
-       cmd = cmd + " && "
-       cmd = cmd + "cd " + fPrj.ClientPath
+       cmd := "cd " + fPrj.ClientPath
        cmd = cmd + " && "
        cmd = cmd + "mkdir -p build"
        cmd = cmd + " && "
@@ -107,9 +93,7 @@ func TestExec(t *testing.T) {
        assert.Nil(t, HTTPCli.Post("/exec", exec, &execRes))
        flushChannelExec(chExec, 1000)
 
-       cmd = "export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig/"
-       cmd = cmd + "&&"
-       cmd = cmd + "cd " + fPrj.ClientPath
+       cmd = "cd " + fPrj.ClientPath
        cmd = cmd + "&&"
        cmd = cmd + "cd build"
        cmd = cmd + "&&"
@@ -119,7 +103,7 @@ func TestExec(t *testing.T) {
        flushChannelExec(chExec, 1000)
 
        /*check afb-helloworld.so exists*/
-       _, err = os.Stat(path.Join(fPrj.ClientPath, "build/helloworld-afb/afb-helloworld.so"))
+       _, err := os.Stat(path.Join(fPrj.ClientPath, "build/helloworld/helloworld.so"))
        assert.Nil(t, err)
 
        assert.Nil(t, HTTPCli.Delete("/folders/"+cfg.ID, &cfg))

diff --git a/test/fixtures/helloworld/CMakeLists.txt b/test/fixtures/helloworld/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f757721
--- /dev/null
+++ b/test/fixtures/helloworld/CMakeLists.txt
@@ -0,0 +1,3 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake)

diff --git a/test/fixtures/helloworld/conf.d/cmake/config.cmake b/test/fixtures/helloworld/conf.d/cmake/config.cmake
new file mode 100644 (file)
index 0000000..00b4de1
--- /dev/null
+++ b/test/fixtures/helloworld/conf.d/cmake/config.cmake
@@ -0,0 +1,167 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# 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.
+###########################################################################
+
+# Project Info
+# ------------------
+set(PROJECT_NAME helloworld)
+set(PROJECT_VERSION "1.0")
+set(PROJECT_PRETTY_NAME "Helloworld")
+set(PROJECT_DESCRIPTION "Provide an Helloworld program")
+set(PROJECT_AUTHOR "Iot-Team")
+set(PROJECT_AUTHOR_MAIL "secretaria@iot.bzh")
+set(PROJECT_LICENSE "APL2.0")
+set(PROJECT_LANGUAGES,"C")
+
+# Where are stored default templates files from submodule or subtree app-templates in your project tree
+# relative to the root project directory
+set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
+
+# Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
+# but used and must be built and linked.
+# set(PROJECT_LIBDIR "libs")
+
+# Where are stored data for your application. Pictures, static resources must be placed in that folder.
+# set(PROJECT_RESOURCES "data")
+
+# Which directories inspect to find CMakeLists.txt target files
+# set(PROJECT_SRC_DIR_PATTERN "*")
+
+# Compilation Mode (DEBUG, RELEASE)
+# ----------------------------------
+set(CMAKE_BUILD_TYPE "DEBUG")
+
+# Kernel selection if needed. You can choose between a
+# mandatory version to impose a minimal version.
+# Or check Kernel minimal version and just print a Warning
+# about missing features and define a preprocessor variable
+# to be used as preprocessor condition in code to disable
+# incompatibles features. Preprocessor define is named
+# KERNEL_MINIMAL_VERSION_OK.
+#
+# NOTE*** FOR NOW IT CHECKS KERNEL Yocto environment and
+# Yocto SDK Kernel version.
+# -----------------------------------------------
+#set (kernel_mandatory_version 4.8)
+#set (kernel_minimal_version 4.8)
+
+# Compiler selection if needed. Impose a minimal version.
+# -----------------------------------------------
+set (gcc_minimal_version 4.9)
+
+# PKG_CONFIG required packages
+# -----------------------------
+
+
+# Print a helper message when every thing is finished
+# ----------------------------------------------------
+
+# Customize link option
+# -----------------------------
+#list(APPEND link_libraries -an-option)
+
+# Compilation options definition
+# Use CMake generator expressions to specify only for a specific language
+# Values are prefilled with default options that is currently used.
+# Either separate options with ";", or each options must be quoted separately
+# DO NOT PUT ALL OPTION QUOTED AT ONCE , COMPILATION COULD FAILED !
+# ----------------------------------------------------------------------------
+#set(COMPILE_OPTIONS "-Wall" "-Wextra" "-Wconversion" "-Wno-unused-parameter" "-Wno-sign-compare" "-Wno-sign-conversion" "-Werror=maybe-uninitialized" "-Werror=implicit-function-declaration" "-ffunction-sections" "-fdata-sections" "-fPIC" CACHE STRING "Compilation flags")
+#set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.")
+#set(CXX_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C++ language.")
+#set(PROFILING_COMPILE_OPTIONS "-g" "-O0" "-pg" "-Wp,-U_FORTIFY_SOURCE" CACHE STRING "Compilation flags for PROFILING build type.")
+#set(DEBUG_COMPILE_OPTIONS "-g" "-ggdb" "-Wp,-U_FORTIFY_SOURCE" CACHE STRING "Compilation flags for DEBUG build type.")
+#set(CCOV_COMPILE_OPTIONS "-g" "-O2" "--coverage" CACHE STRING "Compilation flags for CCOV build type.")
+#set(RELEASE_COMPILE_OPTIONS "-g" "-O2" CACHE STRING "Compilation flags for RELEASE build type.")
+
+# Print a helper message when every thing is finished
+# ----------------------------------------------------
+#set(CLOSING_MESSAGE "")
+#set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
+
+# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
+# ---------------------------------------------------------------------
+set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
+
+
+# Mandatory widget Mimetype specification of the main unit
+# --------------------------------------------------------------------------
+# Choose between :
+#- text/html : HTML application,
+#      content.src designates the home page of the application
+#
+#- application/vnd.agl.native : AGL compatible native,
+#      content.src designates the relative path of the binary.
+#
+# - application/vnd.agl.service: AGL service, content.src is not used.
+#
+#- ***application/x-executable***: Native application,
+#      content.src designates the relative path of the binary.
+#      For such application, only security setup is made.
+#
+set(WIDGET_TYPE application/vnd.agl.service)
+
+# Mandatory Widget entry point file of the main unit
+# --------------------------------------------------------------
+# This is the file that will be executed, loaded,
+# at launch time by the application framework.
+#
+set(WIDGET_ENTRY_POINT config.xml)
+
+# Optional dependencies order
+# ---------------------------
+#set(EXTRA_DEPENDENCIES_ORDER)
+
+# Optional Extra global include path
+# -----------------------------------
+#set(EXTRA_INCLUDE_DIRS)
+
+# Optional extra libraries
+# -------------------------
+#set(EXTRA_LINK_LIBRARIES)
+
+# Optional force binding installation
+# ------------------------------------
+# set(BINDINGS_INSTALL_PREFIX PrefixPath )
+
+# Optional force binding Linking flag
+# ------------------------------------
+# set(BINDINGS_LINK_FLAG LinkOptions )
+
+# Optional force package prefix generation, like widget
+# -----------------------------------------------------
+# set(PKG_PREFIX DestinationPath)
+
+# Optional Application Framework security token
+# and port use for remote debugging.
+#------------------------------------------------------------
+#set(AFB_TOKEN   ""      CACHE PATH "Default AFB_TOKEN")
+#set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN")
+
+# Optional schema validator about now only XML, LUA and JSON
+# are supported
+#------------------------------------------------------------
+#set(LUA_CHECKER "luac" CACHE STRING "LUA compiler")
+#set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
+#set(JSON_CHECKER "json_verify" CACHE STRING "JSON linter")
+
+# This include is mandatory and MUST happens at the end
+# of this file, else you expose you to unexpected behavior
+# -----------------------------------------------------------
+include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)

diff --git a/test/fixtures/helloworld/helloworld/CMakeLists.txt b/test/fixtures/helloworld/helloworld/CMakeLists.txt
new file mode 100644 (file)
index 0000000..373a6f5
--- /dev/null
+++ b/test/fixtures/helloworld/helloworld/CMakeLists.txt
@@ -0,0 +1,36 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# 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.
+###########################################################################
+
+# Add target to project dependency list
+PROJECT_TARGET_ADD(helloworld)
+
+    # Define project Targets
+    file(GLOB sourcelist "*.c")
+
+    # Define project Targets
+    ADD_LIBRARY(${TARGET_NAME} MODULE ${sourcelist})
+
+    # Binder exposes a unique public entry point
+    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
+       PREFIX ""
+        LABELS "BINDING"
+       LINK_FLAGS  ${BINDINGS_LINK_FLAG}
+        OUTPUT_NAME ${TARGET_NAME}
+    )
+
+    TARGET_LINK_LIBRARIES(${TARGET_NAME}
+           ${link_libraries}
+    )

diff --git a/test/fixtures/helloworld/helloworld/helloworld.c b/test/fixtures/helloworld/helloworld/helloworld.c
new file mode 100644 (file)
index 0000000..94ebcdc
--- /dev/null
+++ b/test/fixtures/helloworld/helloworld/helloworld.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main() {
+    printf ("Hello, World!\n");
+    return 0;
+}