Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #7 from mkosola/master
Fixes to tests.xml and packaging
  • Loading branch information
Matti Kosola committed Oct 13, 2014
2 parents 36f2060 + aa79556 commit 745b552
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
6 changes: 3 additions & 3 deletions benchmarks/gen-benchmarks-xml.sh
Expand Up @@ -2,7 +2,7 @@

TESTDIR=`dirname $0`
DOMAIN="Application Framework"
FEATURE="MeeGo Touch UI Framework"
FEATURE="MLocale library"
TYPE="Benchmarks"
LEVEL="Component"

Expand All @@ -22,7 +22,7 @@ for TEST in `ls -d ?t_*`; do
fi

TESTCASE_TEMPLATE="<case name=\"$TEST\" description=\"$TEST\" requirement=\"\" timeout=\"300\" insignificant=\"$INSIGNIFICANT\">
<step expected_result=\"0\">/usr/lib/libmeegotouch-benchmarks/$TEST</step>
<step expected_result=\"0\">/usr/lib/libmlocale-benchmarks5/$TEST</step>
</case>
"

Expand All @@ -41,7 +41,7 @@ done

TESTSUITE_TEMPLATE="<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>
<testdefinition version=\"0.1\">
<suite name=\"libmeegotouch-benchmarks\" domain=\"$DOMAIN\" type=\"$TYPE\" level=\"$LEVEL\">
<suite name=\"libmlocale-benchmarks\" domain=\"$DOMAIN\" type=\"$TYPE\" level=\"$LEVEL\">
<set name=\"benchmark_memory_tests\" description=\"Memory Benchmark Unit Tests\" feature=\"$FEATURE\">
$MT_TESTCASES
Expand Down
3 changes: 3 additions & 0 deletions rpm/libmlocale-qt5.spec
Expand Up @@ -91,6 +91,7 @@ export QT_SELECT=5
%defattr(-,root,root,-)
%doc LICENSE.LGPL
%{_libdir}/*.so.*
%dir %{_datadir}/mlocale5
%{_datadir}/mlocale5/icu
# >> files
# << files
Expand All @@ -109,13 +110,15 @@ export QT_SELECT=5
%files tests
%defattr(-,root,root,-)
%{_libdir}/libmlocale-tests5
%dir %{_datadir}/libmlocale-tests5
%{_datadir}/libmlocale-tests5/tests.xml
# >> files tests
# << files tests

%files benchmarks
%defattr(-,root,root,-)
%{_libdir}/libmlocale-benchmarks5
%dir %{_datadir}/libmlocale-benchmarks5
%{_datadir}/libmlocale-benchmarks5/tests.xml
# >> files benchmarks
# << files benchmarks
3 changes: 3 additions & 0 deletions rpm/libmlocale-qt5.yaml
Expand Up @@ -23,6 +23,7 @@ PkgBR:
Files:
- "%doc LICENSE.LGPL"
- "%{_libdir}/*.so.*"
- "%dir %{_datadir}/mlocale5"
- "%{_datadir}/mlocale5/icu"
SubPackages:
- Name: devel
Expand All @@ -43,6 +44,7 @@ SubPackages:
Description: "%{summary}."
Files:
- "%{_libdir}/libmlocale-tests5"
- "%dir %{_datadir}/libmlocale-tests5"
- "%{_datadir}/libmlocale-tests5/tests.xml"

- Name: benchmarks
Expand All @@ -51,5 +53,6 @@ SubPackages:
Description: "%{summary}."
Files:
- "%{_libdir}/libmlocale-benchmarks5"
- "%dir %{_datadir}/libmlocale-benchmarks5"
- "%{_datadir}/libmlocale-benchmarks5/tests.xml"

2 changes: 1 addition & 1 deletion tests/gen-tests-xml.sh
Expand Up @@ -3,7 +3,7 @@
TESTDIR=`dirname $0`
INSTALL_PATH=$1
DOMAIN="Application Framework"
FEATURE="MeeGo Touch UI Framework"
FEATURE="MLocale library"
TYPE="Functional"
LEVEL="Component"

Expand Down

0 comments on commit 745b552

Please sign in to comment.