Updated the build config file for gbs build

Change-Id: I562340c38c32fe1815083521bf0441637c86eead
Signed-off-by: Hao Yunfei <yunfeix.hao@intel.com>

diff --git a/configure.ac b/configure.ac
index 67b4b29..a902dc1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,15 +31,16 @@
 AC_INIT([wrt], [1.3.6], [yugang.fan@intel.com])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_FILES([Makefile \
-        tct-extension-tests/Makefile  \
-        tct-management-tests/Makefile  \
-       tct-management-tests/resources/Makefile \
-        tct-runtime-tests/Makefile  \
-        tct-wrtui-tests/Makefile  \
-        tct-privacy-tests/Makefile \
-        tct-acceptance-tests/Makefile  \
-       tct-acceptance-tests/WebRunTime/Makefile \
-       tct-stability-tests/Makefile \
-       tct-widget-tests/Makefile
+        tct-ext01-wrt-tests/Makefile \
+        tct-ext02-wrt-tests/Makefile \
+        tct-pm-wrt-tests/resources/Makefile \
+        tct-pm-wrt-tests/Makefile \
+        tct-pm-wrt-tests/WebRunTime/Makefile \
+        tct-rt01-wrt-tests/Makefile \
+        tct-rt02-wrt-tests/Makefile \
+        tct-ui-wrt-tests/Makefile \
+        tct-sp-wrt-tests/Makefile \
+        tct-stab-wrt-tests/Makefile \
+        tct-appwgt-wrt-tests/Makefile \
 ])
 AC_OUTPUT

diff --git a/packaging/tct-wrt.spec b/packaging/tct-wrt.spec
index 9e452a6..f725fc2 100644 (file)
--- a/packaging/tct-wrt.spec
+++ b/packaging/tct-wrt.spec
@@ -10,7 +10,7 @@ Source: %name-%version.tar.gz
 %description
 This is general Tizen integration test suite 
 
-%package -n tct-extension-tests
+%package -n tct-ext01-wrt-tests
 Summary: wrt config extension test suite
 Version: 1.3.6
 Release: 1
@@ -18,10 +18,21 @@ License: BSD
 Group: test/tct/wrt
 BuildRequires: zip
 
-%description -n tct-extension-tests
+%description -n tct-ext01-wrt-tests
 This is wrt config extension test suite package
 
-%package -n tct-management-tests
+%package -n tct-ext02-wrt-tests
+Summary: wrt config extension test suite
+Version: 1.3.6
+Release: 1
+License: BSD
+Group: test/tct/wrt
+BuildRequires: zip
+
+%description -n tct-ext02-wrt-tests
+This is wrt config extension test suite package
+
+%package -n tct-pm-wrt-tests
 Summary: wrt package management test suite
 Version: 1.3.6
 Release: 1
@@ -29,10 +40,10 @@ License: BSD
 Group: test/tct/wrt
 BuildRequires: zip
 
-%description -n tct-management-tests
+%description -n tct-pm-wrt-tests
 This is wrt package management test suite package
 
-%package -n tct-runtime-tests
+%package -n tct-rt01-wrt-tests
 Summary: wrt runtime test suite
 Version: 1.3.6
 Release: 1
@@ -40,43 +51,43 @@ License: BSD
 Group: test/tct/wrt
 BuildRequires: zip
 
-%description -n tct-runtime-tests
+%description -n tct-rt01-wrt-tests
 This is wrt runtime test suite package
 
-%package -n tct-wrtui-tests
-Summary: wrt runtime ui test suite
+%package -n tct-rt02-wrt-tests
+Summary: wrt runtime test suite
 Version: 1.3.6
 Release: 1
 License: BSD
 Group: test/tct/wrt
 BuildRequires: zip
 
-%description -n tct-wrtui-tests
-This is wrt runtime ui test suite package
+%description -n tct-rt02-wrt-tests
+This is wrt runtime test suite package
 
-%package -n tct-privacy-tests
-Summary: wrt security privacy test suite
+%package -n tct-ui-wrt-tests
+Summary: wrt runtime ui test suite
 Version: 1.3.6
 Release: 1
 License: BSD
 Group: test/tct/wrt
 BuildRequires: zip
 
-%description -n tct-privacy-tests
-This is wrt security privacy test suite package
+%description -n tct-ui-wrt-tests
+This is wrt runtime ui test suite package
 
-%package -n tct-acceptance-tests
-Summary: wrt acceptance tests
+%package -n tct-sp-wrt-tests
+Summary: wrt security privacy test suite
 Version: 1.3.6
 Release: 1
 License: BSD
 Group: test/tct/wrt
 BuildRequires: zip
 
-%description -n tct-acceptance-tests
-This is wrt acceptance test suite package
+%description -n tct-sp-wrt-tests
+This is wrt security privacy test suite package
 
-%package -n tct-stability-tests
+%package -n tct-stab-wrt-tests
 Summary: wrt stability tests
 Version: 1.3.6
 Release: 1
@@ -84,10 +95,10 @@ License: BSD
 Group: test/tct/wrt
 BuildRequires: zip
 
-%description -n tct-stability-tests
+%description -n tct-stab-wrt-tests
 This is wrt stability test suite package
 
-%package -n tct-widget-tests
+%package -n tct-appwgt-wrt-tests
 Summary: wrt webapp widget tests
 Version: 1.3.6
 Release: 1
@@ -95,7 +106,7 @@ License: BSD
 Group: test/tct/wrt
 BuildRequires: zip
 
-%description -n tct-widget-tests
+%description -n tct-appwgt-wrt-tests
 This is wrt webapp widget test suite package
 
 %prep
@@ -103,13 +114,15 @@ This is wrt webapp widget test suite package
 
 %build
 unset LD_AS_NEEDED  
-sh inst.sh "tct-extension-tests" $RPM_BUILD_ROOT
-sh inst.sh "tct-management-tests" $RPM_BUILD_ROOT
-sh inst.sh "tct-runtime-tests" $RPM_BUILD_ROOT
-sh inst.sh "tct-wrtui-tests" $RPM_BUILD_ROOT
-sh inst.sh "tct-privacy-tests" $RPM_BUILD_ROOT
-sh inst.sh "tct-stability-tests" $RPM_BUILD_ROOT
-sh inst.sh "tct-widget-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-ext01-wrt-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-ext02-wrt-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-pm-wrt-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-rt01-wrt-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-rt02-wrt-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-ui-wrt-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-sp-wrt-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-stab-wrt-tests" $RPM_BUILD_ROOT
+sh inst.sh "tct-appwgt-wrt-tests" $RPM_BUILD_ROOT
 ./autogen
 ./configure --prefix=/usr
 make
@@ -123,34 +136,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-%files -n tct-extension-tests
-/opt/tct-extension-tests
-/usr/share/tct-extension-tests
+%files -n tct-ext01-wrt-tests
+/opt/tct-ext01-wrt-tests
+/usr/share/tct-ext01-wrt-tests
+
+%files -n tct-ext02-wrt-tests
+/opt/tct-ext02-wrt-tests
+/usr/share/tct-ext02-wrt-tests
 
-%files -n tct-management-tests
-/opt/tct-management-tests
-/usr/share/tct-management-tests
+%files -n tct-pm-wrt-tests
+/opt/tct-pm-wrt-tests
+/usr/share/tct-pm-wrt-tests
 
-%files -n tct-runtime-tests
-/opt/tct-runtime-tests
-/usr/share/tct-runtime-tests
+%files -n tct-rt01-wrt-tests
+/opt/tct-rt01-wrt-tests
+/usr/share/tct-rt01-wrt-tests
 
-%files -n tct-wrtui-tests
-/opt/tct-wrtui-tests
-/usr/share/tct-wrtui-tests
+%files -n tct-rt02-wrt-tests
+/opt/tct-rt02-wrt-tests
+/usr/share/tct-rt02-wrt-tests
 
-%files -n tct-privacy-tests
-/opt/tct-privacy-tests
-/usr/share/tct-privacy-tests
+%files -n tct-ui-wrt-tests
+/opt/tct-ui-wrt-tests
+/usr/share/tct-ui-wrt-tests
 
-%files -n tct-acceptance-tests
-/opt/tct-acceptance-tests
-/usr/share/tct-acceptance-tests
+%files -n tct-sp-wrt-tests
+/opt/tct-sp-wrt-tests
+/usr/share/tct-sp-wrt-tests
 
-%files -n tct-stability-tests
-/opt/tct-stability-tests
-/usr/share/tct-stability-tests
+%files -n tct-stab-wrt-tests
+/opt/tct-stab-wrt-tests
+/usr/share/tct-stab-wrt-tests
 
-%files -n tct-widget-tests
-/opt/tct-widget-tests
-/usr/share/tct-widget-tests
+%files -n tct-appwgt-wrt-tests
+/opt/tct-appwgt-wrt-tests
+/usr/share/tct-appwgt-wrt-tests

diff --git a/tct-pm-wrt-tests/resources/Makefile.am b/tct-pm-wrt-tests/resources/Makefile.am
index c5de814..7c61c2a 100644 (file)
--- a/tct-pm-wrt-tests/resources/Makefile.am
+++ b/tct-pm-wrt-tests/resources/Makefile.am
@@ -1,2 +1,2 @@
 dist_resources_DATA = *.wgt
-resourcesdir= /opt/tct-management-tests/
+resourcesdir= /opt/tct-pm-wrt-tests/