Merge branch 'f40' into c10s

.fmf/version

@@ -0,0 +1 @@
+1

plans/test.fmf

@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt

tests/runtest.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-for dir in annotations annotationsDerived; do
-    for xml in /usr/share/unicode/cldr/common/$dir/*.xml; do
-        echo xmllint --noout --valid --postvalid $xml
-        xmllint --noout --valid --postvalid $xml
-        if [ $? -ne 0 ] ; then
-            echo "ERROR"
-            exit 1
-        fi
-    done
-done
-

tests/tests.yml

@@ -1,16 +0,0 @@
-- hosts: localhost
-  vars:
-  - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}"
-  tags:
-  - classic
-  remote_user: root
-  roles:
-  - role: standard-test-basic
-    required_packages:
-    - cldr-emoji-annotation
-    - libxml2
-    tests:
-    - runtest:
-        dir: .
-        run: ./runtest.sh
-

tests/validation/main.fmf

@@ -0,0 +1,6 @@
+summary: Lint check for annotation files
+test: ./test.sh
+framework: beakerlib
+require:
+    - cldr-emoji-annotation
+    - libxml2

tests/validation/test.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+FAILED=0
+for dir in annotations annotationsDerived; do
+    for xml in /usr/share/unicode/cldr/common/$dir/*.xml; do
+        echo xmllint --noout --valid --postvalid $xml
+        xmllint --noout --valid --postvalid $xml
+        if test $? -ne 0 ; then
+            FAILED=1
+            break
+        fi
+    done
+    if test $FAILED -ne 0 ; then
+        break
+    fi
+done
+
+rlJournalStart
+    rlPhaseStartTest
+        rlAssertEquals "lint result" $FAILED 0
+    rlPhaseEnd
+rlJournalEnd