Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.fmf/version

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

.gitignore

@@ -2,3 +2,7 @@ libunistring-0.9.3.tar.gz
 /libunistring-0.9.4.tar.xz
 /libunistring-0.9.7.tar.xz
 /libunistring-0.9.8.tar.xz
+/libunistring-0.9.9.tar.xz
+/libunistring-0.9.10.tar.xz
+/libunistring-1.0.tar.xz
+/libunistring-1.1.tar.xz

changelog

@@ -0,0 +1,127 @@
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jan 23 2022 Daiki Ueno <dueno@redhat.com> - 1.0-1
+- Update to upstream 1.0 release
+- Switch to %%autosetup
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 21 2021 Mike FABIAN <mfabian@redhat.com> - 0.9.10-13
+- Related rhbz#1938800: Fix CI tests and convert them to tmt
+
+* Mon Jun 14 2021 Mike FABIAN <mfabian@redhat.com> - 0.9.10-12
+- Fix memory leak in vasnprint. Resolves: rhbz#1938800
+  (Backported from upstream: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4d288a80bf7ebe29334b9805cdcc70eacb6059c1)
+- Fix spelling in license GPLV2+ -> GPLv2+
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 0.9.10-8
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.9.10-4
+- Rebuild with fixed binutils
+
+* Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.10-3
+- Replace obsolete scriptlets
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon May 28 2018 Daiki Ueno <dueno@redhat.com> - 0.9.10-1
+- Update to upstream 0.9.10 release
+
+* Thu Mar 01 2018 Daiki Ueno <dueno@redhat.com> - 0.9.9-1
+- Update to upstream 0.9.9 release
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.8-2
+- Switch to %%ldconfig_scriptlets
+
+* Sat Dec  2 2017 Daiki Ueno <dueno@redhat.com> - 0.9.8-1
+- Update to 0.9.8
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 17 2017 Daiki Ueno <dueno@redhat.com> - 0.9.7-1
+- Update to 0.9.7
+- Update license to "GPLv2+ or LGPLv2+"
+
+* Wed Feb 01 2017 Stephen Gallagher <sgallagh@redhat.com> - 0.9.4-4
+- Add missing %%license macro
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Sep 02 2014 Pádraig Brady <pbrady@redhat.com> - 0.9.4-1
+- Latest upstream
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Aug 29 2013 Pádraig Brady <P@draigBrady.com> 0.9.3-9
+- Adjust to avoid duplicate docs caused by %%doc macro changes in Fedora 20
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jun 26 2012 Akira TAGOH <tagoh@redhat.com> - 0.9.3-5
+- Fix a typo in %%preun. (#737638)
+
+* Tue May 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.3-4
+- Add bundled(gnulib) provides
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun May 23 2010 Pádraig Brady <P@draigBrady.com> 0.9.3-1
+- Update to 0.9.3
+
+* Thu Nov 19 2009 Pádraig Brady <P@draigBrady.com> 0.9.1-3
+- Remove glibc-devel and texinfo build deps
+
+* Thu Nov 19 2009 Pádraig Brady <P@draigBrady.com> 0.9.1-2
+- Changes as per initial review by panemade@gmail.com
+
+* Tue Nov 17 2009 Pádraig Brady <P@draigBrady.com> 0.9.1-1
+- Initial version

libunistring.spec

@@ -1,13 +1,13 @@
+# This spec file has been automatically updated
+Version:	1.1
+Release: %{?autorelease}%{!?autorelease:1%{?dist}}
 Name: libunistring
-Version: 0.9.8
-Release: 3%{?dist}
-Group: System Environment/Libraries
 Summary: GNU Unicode string library
-License: GPLV2+ or LGPLv3+
-Url: http://www.gnu.org/software/libunistring/
-Source0: http://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz
-Requires(post): info
-Requires(preun): info
+License: GPL-2.0-or-later OR LGPL-3.0-or-later
+URL: https://www.gnu.org/software/libunistring/
+Source0: https://ftp.gnu.org/gnu/libunistring/%{name}-%{version}.tar.xz
+BuildRequires: gcc
+BuildRequires: make
 Provides: bundled(gnulib)
 
 %description
@@ -18,35 +18,32 @@ This portable C library implements Unicode string types in three flavours:
 case folding and regular expressions).
 
 %package devel
-Group: Development/Libraries
 Summary: GNU Unicode string library - development files
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Development files for programs using libunistring.
 
 %prep
-%setup -q
+%autosetup
 
 %build
 %configure --disable-static --disable-rpath
-make %{?_smp_mflags}
+%make_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.la
+%make_install
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la
 # Move staged docs so not picked up by %%doc in main package
 mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc
 
 %files
-%defattr(-,root,root,-)
 %license COPYING COPYING.LIB
 %doc AUTHORS NEWS README
-%{_libdir}/%{name}.so.*
+%{_libdir}/%{name}.so.5*
 
 %files devel
-%defattr(-,root,root,-)
 %doc HACKING DEPENDENCIES THANKS ChangeLog
 %doc __doc/*
 %{_infodir}/%{name}.info*
@@ -56,84 +53,5 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc
 
 %ldconfig_scriptlets
 
-%post devel
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-
-%preun devel
-if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
-
 %changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.8-2
-- Switch to %%ldconfig_scriptlets
-
-* Sat Dec  2 2017 Daiki Ueno <dueno@redhat.com> - 0.9.8-1
-- Update to 0.9.8
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 17 2017 Daiki Ueno <dueno@redhat.com> - 0.9.7-1
-- Update to 0.9.7
-- Update license to "GPLv2+ or LGPLv2+"
-
-* Wed Feb 01 2017 Stephen Gallagher <sgallagh@redhat.com> - 0.9.4-4
-- Add missing %%license macro
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Sep 02 2014 Pádraig Brady <pbrady@redhat.com> - 0.9.4-1
-- Latest upstream
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Aug 29 2013 Pádraig Brady <P@draigBrady.com> 0.9.3-9
-- Adjust to avoid duplicate docs caused by %%doc macro changes in Fedora 20
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jun 26 2012 Akira TAGOH <tagoh@redhat.com> - 0.9.3-5
-- Fix a typo in %%preun. (#737638)
-
-* Tue May 15 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.3-4
-- Add bundled(gnulib) provides
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun May 23 2010 Pádraig Brady <P@draigBrady.com> 0.9.3-1
-- Update to 0.9.3
-
-* Thu Nov 19 2009 Pádraig Brady <P@draigBrady.com> 0.9.1-3
-- Remove glibc-devel and texinfo build deps
-
-* Thu Nov 19 2009 Pádraig Brady <P@draigBrady.com> 0.9.1-2
-- Changes as per initial review by panemade@gmail.com
-
-* Tue Nov 17 2009 Pádraig Brady <P@draigBrady.com> 0.9.1-1
-- Initial version
+%autochangelog

plans/basic.fmf

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

sources

@@ -1 +1 @@
-SHA512 (libunistring-0.9.8.tar.xz) = d4b673d7da3fc122fbc1694a64f9c685f1cfe83592ff427420cb8bbd87169b860740e339c4a8c4b7f72769572eef804fedaa6b607308f243d857209972deb235
+SHA512 (libunistring-1.1.tar.xz) = 01a4267bbd301ea5c389b17ee918ae5b7d645da8b2c6c6f0f004ff2dead9f8e50cda2c6047358890a5fceadc8820ffc5154879193b9bb8970f3fb1fea1f411d6

tests/libunistring-tests/.gitignore

@@ -0,0 +1,2 @@
+test
+testfile.utf*

tests/libunistring-tests/Makefile

@@ -1,63 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/python/libunistring-tests
-#   Description: Functional tests for libunistring.
-#   Author: Pooja Yadav <poyadav@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2015 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-export TEST=/CoreOS/python/libunistring-tests
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) libunistring_test.py Makefile test runtest.sh
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Pooja Yadav <poyadav@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Functional test for the gettext module" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
-	@echo "RunFor:          python" >> $(METADATA)
-	@echo "Requires:        python" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
-

tests/libunistring-tests/libunistring_test.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
+import sys
 import os
 import subprocess
 import logging
 
-""" 
+"""
 Creating a result.log file for saving logs
 """
 logging.basicConfig(level=logging.INFO)
@@ -13,67 +14,45 @@ logging.info("TEST RESULTS FOR <uniconv.h> FUNCTION\n\n")
 
 data = []
 
-def create_testfile():
-    testfile = subprocess.call("./test 'Bonjour le monde'" , shell=True)
-    with open("./testfile.in") as fh:
-        lines = fh.readlines()
-        global data
-        data = lines
+TESTTEXT = 'Viele Grüße\n日本語\n'
 
-def test_utf8():
+def create_testfiles():
+    dummy = subprocess.run("./test '" + TESTTEXT + "'", shell=True)
+
+def test(path='', encoding=''):
     """
-    Check UTF-8 encoding
+    Read the file at path using the specified encoding and check
+    whether the TESTTEXT can be read back correctly.
     """
+    logging.info('Testing file %s using encoding %s', path, encoding)
     try:
-        conv8 = data[0].strip("\n").decode('utf-8')
-        conv16 = data[0].strip("\n").decode('utf-16')
-        if conv8 == ("Bonjour le monde") and conv16 != ("Bonjour le monde"):
-            logging.info("UTF-8 Conversion Test: SUCCESS")
+        with open(path, mode='rt', encoding=encoding) as testfile:
+            text = testfile.read()
+        logging.info('TESTTEXT="%s", text read ="%s"\n', TESTTEXT, text)
+        if text == TESTTEXT:
+            logging.info(
+                'testfile: %s testencoding: %s Read test: SUCCESS',
+                path, encoding)
         else:
-            logging.error("UTF-8 Conversion Test: ERROR")
+            logging.info(
+                'testfile: %s testencoding: %s Read test: ERROR',
+                path, encoding)
     except UnicodeError:
         logging.error("UTF-8 Conversion Test: UnicodeError")
-            
-def test_utf_16():
-    """
-    Check UTF-16 encoding
-    """
-    try:
-        conv16 = data[1].strip("\n").decode('utf-16')
-        conv8 = data[1].strip("\n").decode('utf-8')
-        if conv16 == ("Bonjour le monde") and conv8 != ("Bonjour le monde"):
-            logging.info("UTF-16 Conversion Test: SUCCESS")
-        else:
-            logging.error("UTF-16 Conversion Test: ERROR")
-    except UnicodeError:
-        logging.error("UTF-16 Conversion Test: UnicodeError")
-
-def test_utf_32():
-    """
-    Check UTF-32 encoding
-    """
-    try:
-        conv8 = data[2].strip("\n").decode('utf-8')
-        conv16= data[2].strip("\n").decode('utf-16')
-        conv32 = data[2].strip("\n").decode('utf-32')
-        if conv32 == ("Bonjour le monde") and conv8 and conv16 != ("Bonjour le monde"):
-            logging.info("UTF-32 Conversion Test: SUCCESS")
-        else:
-            logging.error("UTF-32 Conversion Test: ERROR")
-    except UnicodeError:
-        logging.error("UTF-32 Conversion Test: UnicodeError")
-
-def del_testfile():
-    try:
-        subprocess.call(['rm', '-rf', './testfile.in'])
-    except OSError as e:
-        logging.error("OSError\n")
-
 
 if __name__ == "__main__":
-    del_testfile()
-    create_testfile()
-    test_utf8()
-    test_utf_16()
-    test_utf_32()
-
+    if sys.byteorder == 'little':
+        endianness = 'le'
+    else:
+        endianness = 'be'
+    testfiles = {
+        'testfile.utf-8': 'utf-8',
+        'testfile.utf-16': 'utf-16' + endianness,
+        'testfile.utf-32': 'utf-32' + endianness,
+    }
+    for testfile in testfiles:
+        if os.path.isfile(testfile):
+            os.unlink(testfile)
+    create_testfiles()
+    for testfile in testfiles:
+        test(path=testfile, encoding=testfiles[testfile])

tests/libunistring-tests/main.fmf

@@ -0,0 +1,16 @@
+summary: Functional test for the gettext module
+contact: Pooja Yadav <poyadav@redhat.com>
+component:
+- python
+require:
+- gcc
+- make
+- libunistring
+- libunistring-devel
+test: bash runtest.sh
+framework: beakerlib
+recommend:
+- python
+duration: 5m
+extra-summary: /CoreOS/python/libunistring-tests
+extra-task: /CoreOS/python/libunistring-tests

tests/libunistring-tests/runtest.sh

@@ -27,14 +27,14 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh
-. /usr/lib/beakerlib/beakerlib.sh
+. /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="libunistring"
 
 rlJournalStart
     rlPhaseStartSetup
         rlAssertRpm $PACKAGE
+        rlRun "gcc test.c -lunistring -o test"
         rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
         rlRun "cp libunistring_test.py test $TmpDir"
         rlRun "pushd $TmpDir"

tests/libunistring-tests/test.c

@@ -15,23 +15,24 @@ main (int argc, char **argv)
         }
 
         size_t len8, len16, len32;
-        const char newline = '\n';
 
-        uint8_t *res8 = u8_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len8);
-        uint16_t *res16 = u16_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len16);
-        uint32_t *res32 = u32_conv_from_encoding ("ASCII", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len32);
-
-        int fd = open ("testfile.in", O_WRONLY | O_CREAT, S_IRUSR);
+        uint8_t *res8 = u8_conv_from_encoding ("UTF-8", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len8);
+        uint16_t *res16 = u16_conv_from_encoding ("UTF-8", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len16);
+        uint32_t *res32 = u32_conv_from_encoding ("UTF-8", iconveh_question_mark, argv[1], strlen (argv[1]), NULL, NULL, &len32);
 
+        int fd = open ("testfile.utf-8", O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
         for (int i = 0; i < len8; i++)
                 write (fd, &res8[i], sizeof (uint8_t));
-        write (fd, &newline, 1);
+        close (fd);
+
+        fd = open ("testfile.utf-16", O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
         for (int i = 0; i < len16; i++)
                 write (fd, &res16[i], sizeof (uint16_t));
-        write (fd, &newline, 1);
+        close (fd);
+
+        fd = open ("testfile.utf-32", O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
         for (int i = 0; i < len32; i++)
                 write (fd, &res32[i], sizeof (uint32_t));
-
         close (fd);
 }
 

tests/tests.yml

@@ -1,23 +0,0 @@
----
-
-# Tests for Atomic
-- hosts: localhost
-  tags:
-  - atomic
-  roles:
-  - role: standard-test-beakerlib
-    tests:
-    - libunistring-tests
-
-# Tests for Classic and Container
-- hosts: localhost
-  tags:
-  - classic
-  - container
-  roles:
-  - role: standard-test-beakerlib
-    tests:
-    - libunistring-tests
-    required_packages:
-    - libunistring
-    - libunistring-devel