Use common gbs-build folder for Tizen. (#250)

The gbs-build path is different for root and normal users. This patch helps to
define a common folder by using the TIZEN_BUILD_ROOT.

JSRemoteTest-DCO-1.0-Signed-off-by: Roland Takacs [email protected]

Author: rtakacs

jstest/builder/modules/iotjs.build.config

@@ -182,6 +182,9 @@
       "cmd": "config/tizen/gbsbuild.sh",
       "args": ["--clean"],
       "env": {
+        "TIZEN_BUILD_ROOT": [
+          "%{tizen-build-root}"
+        ],
         "IOTJS_BUILD_OPTION": [
           "--clean",
           "--no-parallel-build",
@@ -255,28 +258,28 @@
     },
     "artifacts": [
       {
-        "src": "%{gbs-iotjs}/build/%{target}/%{build-type}/lib",
+        "src": "%{tizen-iotjs-dir}/build/%{target}/%{build-type}/libs",
         "dst": "%{build-dir}/libs"
       },
       {
-        "src": "%{gbs-iotjs}/build/%{target}/%{build-type}/bin/iotjs",
+        "src": "%{tizen-iotjs-dir}/build/%{target}/%{build-type}/bin/iotjs",
         "dst": "%{build-dir}/iotjs"
       },
       {
-        "src": "%{gbs-iotjs}/build/%{target}/%{build-type}/iotjs.map",
+        "src": "%{tizen-iotjs-dir}/build/%{target}/%{build-type}/iotjs.map",
         "dst": "%{build-dir}/linker.map"
       },
       {
         "src": "%{testsuite}",
         "dst": "%{build-dir}/tests"
       },
       {
-        "src": "%{gbs-iotjs}/test/dynamicmodule/build/tizen/dynamicmodule.iotjs",
+        "src": "%{tizen-iotjs-dir}/test/dynamicmodule/build/tizen/dynamicmodule.iotjs",
         "dst": "%{build-dir}/tests/dynamicmodule/build/tizen/dynamicmodule.iotjs"
       },
       {
-        "src": "%{home}/GBS-ROOT/local/repos/tizen_unified_m1/armv7l/RPMS/%{appname}-1.0.0-0.armv7l.rpm",
-        "dst": "%{build-dir}/%{appname}-1.0.0-0.armv7l.rpm"
+        "src": "%{tizen-rpm-package}",
+        "dst": "%{build-dir}/iotjs-1.0.0-0.armv7l.rpm"
       },
       {
         "src": "%{js-remote-test}/jstest/resources/etc/tester.py",

jstest/common/paths.py

@@ -68,13 +68,3 @@
 TESTRUNNER_PATH = os.path.join(JSTEST_PATH, 'testrunner')
 
 SKIPLIST_PATH = os.path.join(TESTRUNNER_PATH, 'skiplist')
-
-#
-# ================================
-#
-
-GBS_ROOT_PATH = os.path.join(HOME, 'GBS-ROOT')
-
-GBS_ARCH_PATH = os.path.join(GBS_ROOT_PATH, 'local/BUILD-ROOTS/scratch.armv7l.0')
-
-GBS_IOTJS_PATH = os.path.join(GBS_ARCH_PATH, 'home/abuild/rpmbuild/BUILD/iotjs-1.0.0')

jstest/common/symbol_resolver.py

@@ -102,14 +102,17 @@ def resolve_symbol(symbol, env):
         'gateway': env.options.router,
         'netmask': env.options.netmask,
         'build-type': env.options.buildtype,
+        'build': env.paths.build,
         'remote-workdir': env.options.remote_workdir,
         'use-stack': 'no-stack' if env.options.no_memstat else 'stack',
         'communication': 'telnet' if env.options.ip else 'serial',
         'target': _TARGETS[env.options.device],
         'js-remote-test': paths.PROJECT_ROOT,
         'result-path': paths.RESULT_PATH,
         'build-path': paths.BUILD_PATH,
-        'gbs-iotjs': paths.GBS_IOTJS_PATH,
+        'tizen-build-root': env.paths['tizen-build-root'],
+        'tizen-iotjs-dir': env.paths['tizen-iotjs-dir'],
+        'tizen-rpm-package': env.paths['tizen-rpm-package'],
         'patches': paths.PATCHES_PATH,
         'config': paths.CONFIG_PATH,
         'home': paths.HOME,

jstest/resources/resources.json

@@ -6,13 +6,11 @@
     "artik530": ["freya"]
   },
   "paths": {
-    "result": "%{result-path}/%{appname}/%{device}",
     "build": "%{build-path}/%{appname}/%{device}/%{build-type}",
-    "build-json": "%{build-path}/%{appname}/%{device}/%{build-type}/build.json",
-    "build-test": "%{build-path}/%{appname}/%{device}/%{build-type}/test",
-    "build-target": "%{build-path}/%{appname}/%{device}/%{build-type}/profiles/target",
-    "build-minimal": "%{build-path}/%{appname}/%{device}/%{build-type}/profiles/minimal",
-    "tizen-rpm-package": "%{home}/GBS-ROOT/local/repos/tizen_unified_m1/armv7l/RPMS/%{appname}-1.0.0-0.armv7l.rpm"
+    "tizen-build-root": "%{build}/tizen-build-root",
+    "tizen-iotjs-dir": "%{build}/tizen-build-root/local/BUILD-ROOTS/scratch.armv7l.0/home/abuild/rpmbuild/BUILD/iotjs-1.0.0",
+    "tizen-rpm-package": "%{build}/tizen-build-root/local/repos/tizen50m2/armv7l/RPMS/iotjs-1.0.0-0.armv7l.rpm",
+    "result": "%{result-path}/%{appname}/%{device}"
   },
   "modules": {
     "stlink": {