Compare commits
No commits in common. "c8s" and "c9" have entirely different histories.
1
.cogl.metadata
Normal file
1
.cogl.metadata
Normal file
@ -0,0 +1 @@
|
||||
b92d70f74b1df95ba5aeceff4dd203801982bc4f SOURCES/cogl-1.22.8.tar.xz
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/cogl-*.tar.xz
|
||||
SOURCES/cogl-1.22.8.tar.xz
|
||||
|
||||
@ -1,109 +0,0 @@
|
||||
From ecaeb7d2793235466aeac0309880e560233c6516 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 19 Dec 2018 10:30:36 -0500
|
||||
Subject: [PATCH] tests: don't write test log to root owned directory
|
||||
|
||||
At the moments the installed-tests require being run
|
||||
as root, since the log output is redirected to
|
||||
|
||||
/usr/libexec/installed-tests/cogl/.log
|
||||
|
||||
This commit moves it to $TMPDIR instead.
|
||||
---
|
||||
tests/run-tests.sh | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
|
||||
index 7e62bf0f..f4d4051b 100755
|
||||
--- a/tests/run-tests.sh
|
||||
+++ b/tests/run-tests.sh
|
||||
@@ -35,79 +35,83 @@ echo "FIXME = Test failed, but it was an expected failure"
|
||||
echo "PASS! = Unexpected pass"
|
||||
echo ""
|
||||
|
||||
get_status()
|
||||
{
|
||||
case $1 in
|
||||
# Special value we use to indicate that the test failed
|
||||
# but it was an expected failure so don't fail the
|
||||
# overall test run as a result...
|
||||
300)
|
||||
echo -n "FIXME";;
|
||||
# Special value we use to indicate that the test passed
|
||||
# but we weren't expecting it to pass‽
|
||||
400)
|
||||
echo -n 'PASS!';;
|
||||
|
||||
# Special value to indicate the test is missing a required feature
|
||||
500)
|
||||
echo -n "n/a";;
|
||||
|
||||
0)
|
||||
echo -n "ok";;
|
||||
|
||||
*)
|
||||
echo -n "FAIL";;
|
||||
esac
|
||||
}
|
||||
|
||||
run_test()
|
||||
{
|
||||
- $($TEST_BINARY $1 &>.log)
|
||||
+ LOG_FILE=$(mktemp -t $(basename ${TEST_BINARY}).XXXXX)
|
||||
+ $($TEST_BINARY $1 &>$LOG_FILE)
|
||||
TMP=$?
|
||||
var_name=$2_result
|
||||
eval $var_name=$TMP
|
||||
- if grep -q "$MISSING_FEATURE" .log; then
|
||||
+ if grep -q "$MISSING_FEATURE" $LOG_FILE; then
|
||||
if test $TMP -ne 0; then
|
||||
eval $var_name=500
|
||||
else
|
||||
eval $var_name=400
|
||||
fi
|
||||
- elif grep -q "$KNOWN_FAILURE" .log; then
|
||||
+ elif grep -q "$KNOWN_FAILURE" $LOG_FILE; then
|
||||
if test $TMP -ne 0; then
|
||||
eval $var_name=300
|
||||
else
|
||||
eval $var_name=400
|
||||
fi
|
||||
else
|
||||
if test $TMP -ne 0; then EXIT=$TMP; fi
|
||||
fi
|
||||
+
|
||||
+ cat $LOG_FILE
|
||||
+ rm -f $LOG_FILE
|
||||
}
|
||||
|
||||
TITLE_FORMAT="%35s"
|
||||
printf $TITLE_FORMAT "Test"
|
||||
|
||||
if test $HAVE_GL -eq 1; then
|
||||
GL_FORMAT=" %6s %8s %7s %6s %6s"
|
||||
printf "$GL_FORMAT" "GL+FF" "GL+ARBFP" "GL+GLSL" "GL-NPT" "GL3"
|
||||
fi
|
||||
if test $HAVE_GLES2 -eq 1; then
|
||||
GLES2_FORMAT=" %6s %7s"
|
||||
printf "$GLES2_FORMAT" "ES2" "ES2-NPT"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
|
||||
for test in `cat unit-tests`
|
||||
do
|
||||
export COGL_DEBUG=
|
||||
|
||||
if test $HAVE_GL -eq 1; then
|
||||
export COGL_DRIVER=gl
|
||||
export COGL_DEBUG=disable-glsl,disable-arbfp
|
||||
run_test $test gl_ff
|
||||
|
||||
export COGL_DRIVER=gl
|
||||
# NB: we can't explicitly disable fixed + glsl in this case since
|
||||
# the arbfp code only supports fragment processing so we need either
|
||||
# the fixed or glsl vertends
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,12 +1,8 @@
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%global with_wayland 1
|
||||
%endif
|
||||
|
||||
%global with_tests 1
|
||||
|
||||
Name: cogl
|
||||
Version: 1.22.2
|
||||
Release: 11%{?dist}
|
||||
Version: 1.22.8
|
||||
Release: 5%{?dist}
|
||||
Summary: A library for using 3D graphics hardware to draw pretty pictures
|
||||
|
||||
License: LGPLv2+
|
||||
@ -27,18 +23,16 @@ Patch1: 0002-add-GL_ARB_shader_texture_lod-support.patch
|
||||
# and do post blurring.
|
||||
Patch2: 0003-texture-support-copy_sub_image.patch
|
||||
|
||||
Patch11: 0001-tests-don-t-write-test-log-to-root-owned-directory.patch
|
||||
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: git
|
||||
BuildRequires: pkgconfig(cairo)
|
||||
BuildRequires: pkgconfig(egl)
|
||||
BuildRequires: mesa-libEGL-devel
|
||||
BuildRequires: pkgconfig(gbm)
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(gtk-doc)
|
||||
BuildRequires: pkgconfig(libdrm)
|
||||
BuildRequires: pkgconfig(pango)
|
||||
BuildRequires: pkgconfig(xcomposite)
|
||||
BuildRequires: pkgconfig(xdamage)
|
||||
@ -46,18 +40,12 @@ BuildRequires: pkgconfig(xext)
|
||||
BuildRequires: pkgconfig(xfixes)
|
||||
BuildRequires: pkgconfig(xrandr)
|
||||
|
||||
%if 0%{?with_wayland}
|
||||
BuildRequires: pkgconfig(wayland-server)
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
BuildRequires: pkgconfig(wayland-cursor)
|
||||
BuildRequires: pkgconfig(wayland-egl)
|
||||
BuildRequires: pkgconfig(xkbcommon)
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
# From rhughes-f20-gnome-3-12 copr
|
||||
Obsoletes: compat-cogl116 < 1.18
|
||||
%endif
|
||||
BuildRequires: make
|
||||
|
||||
%description
|
||||
Cogl is a small open source library for using 3D graphics hardware to draw
|
||||
@ -101,7 +89,7 @@ This package contains the installable tests for %{cogl}.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -S git
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC"
|
||||
@ -113,10 +101,8 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC"
|
||||
--enable-gtk-doc \
|
||||
--enable-introspection=yes \
|
||||
--enable-kms-egl-platform \
|
||||
%if 0%{?with_wayland}
|
||||
--enable-wayland-egl-platform \
|
||||
--enable-wayland-egl-server \
|
||||
%endif
|
||||
--enable-xlib-egl-platform \
|
||||
%{?with_tests:--enable-installed-tests}
|
||||
|
||||
@ -165,8 +151,45 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcogl-pango.so
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Dec 18 2018 Ray Strode <rstrode@redhat.com> - 1.22.2-11
|
||||
- rebuild
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.22.8-5
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.22.8-4
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Jun 04 2020 Kalev Lember <klember@redhat.com> - 1.22.8-1
|
||||
- Update to 1.22.8
|
||||
|
||||
* Mon Mar 09 2020 Kalev Lember <klember@redhat.com> - 1.22.6-1
|
||||
- Update to 1.22.6
|
||||
|
||||
* Sat Mar 07 2020 Leigh Scott <leigh123linux@gmail.com> - 1.22.4-4
|
||||
- Fix building against libglvnd-provided EGL headers
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Apr 24 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.22.4-1
|
||||
- Update to 1.22.4
|
||||
|
||||
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 1.22.2-13
|
||||
- Backport MR#8 to fix builds of cogl-using packages in F31+
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.2-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.2-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
@ -1,7 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
# - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
1
sources
1
sources
@ -1 +0,0 @@
|
||||
SHA512 (cogl-1.22.2.tar.xz) = 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3
|
||||
@ -1,34 +0,0 @@
|
||||
gnome-desktop-testing-role
|
||||
==========================
|
||||
|
||||
This ansible role is to make it easy to leverage gnome installed tests (via the gnome-desktop-testing module)
|
||||
|
||||
Requirements
|
||||
------------
|
||||
Xvfb
|
||||
|
||||
If gnome-desktop-testing isn't installed it will be built from version control.
|
||||
|
||||
Role Variables
|
||||
--------------
|
||||
The variable installed_test_name is used to describe the name of the installed tests to run.
|
||||
(the basename of the directory in /usr/share/installed-tests)
|
||||
|
||||
Dependencies
|
||||
------------
|
||||
standard-test-roles
|
||||
|
||||
Example Playbook
|
||||
----------------
|
||||
Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
|
||||
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: gnome-desktop-testing-role
|
||||
test_name: mutter
|
||||
tags:
|
||||
- classic
|
||||
|
||||
License
|
||||
-------
|
||||
BSD
|
||||
@ -1,6 +0,0 @@
|
||||
role_pkgs_req:
|
||||
- rsync
|
||||
- xorg-x11-server-Xvfb
|
||||
- dbus-daemon
|
||||
- sudo
|
||||
- tmux
|
||||
@ -1,4 +0,0 @@
|
||||
---
|
||||
|
||||
dependencies:
|
||||
- role: str-common-init
|
||||
@ -1,93 +0,0 @@
|
||||
---
|
||||
- name: Check if GNOME installed-tests testing harness is installed
|
||||
register: gnome_desktop_testing_runner
|
||||
find:
|
||||
paths: "{{ ansible_env.PATH.split(':') }}"
|
||||
pattern: gnome-desktop-testing-runner
|
||||
|
||||
- name: Build and install GNOME installed-tests testing harness
|
||||
when: gnome_desktop_testing_runner.matched == 0
|
||||
block:
|
||||
- name: Installing build dependencies for GNOME installed-tests testing harness
|
||||
package:
|
||||
name:
|
||||
- git
|
||||
- make
|
||||
- gcc
|
||||
- diffutils
|
||||
- autoconf
|
||||
- automake
|
||||
- libtool
|
||||
- glib2-devel
|
||||
- systemd-devel
|
||||
|
||||
- name: Fetching GNOME installed-tests testing harness source from remote repository
|
||||
git:
|
||||
repo: 'https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git'
|
||||
dest: gnome-desktop-testing
|
||||
force: yes
|
||||
|
||||
- name: Configure GNOME installed-tests testing harness build
|
||||
command: ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
|
||||
args:
|
||||
chdir: gnome-desktop-testing
|
||||
|
||||
- name: Build GNOME installed-tests testing harness
|
||||
command: make
|
||||
args:
|
||||
chdir: gnome-desktop-testing
|
||||
|
||||
- name: Install GNOME installed-tests testing harness
|
||||
command: make install
|
||||
args:
|
||||
chdir: gnome-desktop-testing
|
||||
|
||||
- name: Create a user to run GNOME installed-tests as
|
||||
user:
|
||||
name: shadowman
|
||||
state: present
|
||||
|
||||
- name: Start GNOME installed-tests testing harness
|
||||
block:
|
||||
- name: Allow shadowman user access to artifacts dir
|
||||
file:
|
||||
path: "{{ remote_artifacts }}"
|
||||
mode: 01777
|
||||
|
||||
- name: Determine log file name
|
||||
set_fact:
|
||||
log_file: "{{ remote_artifacts }}/{{ installed_test_name }}.log"
|
||||
|
||||
- name: Delete any stale log file
|
||||
file:
|
||||
path: "{{ log_file }}"
|
||||
state: absent
|
||||
|
||||
- name: Execute tests
|
||||
become: yes
|
||||
become_user: shadowman
|
||||
shell: |
|
||||
set -e
|
||||
log_file="{{ log_file }}"
|
||||
exec 2>>$log_file 1>>$log_file
|
||||
status="FAIL"
|
||||
xvfb-run -d -s '-screen 0 1024x768x24' dbus-run-session env TMPDIR='{{ remote_artifacts }}' G_MESSAGES_DEBUG='all' LANG=en_US.utf8 gnome-desktop-testing-runner '{{ installed_test_name }}'
|
||||
if [ $? -eq 0 ]; then
|
||||
status="PASS"
|
||||
fi
|
||||
echo "${status} $TEST" >> {{ remote_artifacts }}/test.log
|
||||
args:
|
||||
chdir: "{{ remote_artifacts }}"
|
||||
|
||||
- name: Check the results
|
||||
shell: grep "^FAIL" {{ remote_artifacts }}/test.log
|
||||
register: test_fails
|
||||
failed_when: False
|
||||
|
||||
- name: Set role result
|
||||
set_fact:
|
||||
role_result_failed: "{{ (test_fails.stdout|d|length > 0) or (test_fails.stderr|d|length > 0) }}"
|
||||
role_result_msg: "{{ test_fails.stdout|d('tests failed.') }}"
|
||||
|
||||
- include_role:
|
||||
name: str-common-final
|
||||
@ -1,10 +0,0 @@
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: gnome-desktop-testing-role
|
||||
installed_test_name: cogl
|
||||
tags:
|
||||
- classic
|
||||
- gating
|
||||
required_packages:
|
||||
- mesa-dri-drivers
|
||||
|
||||
Loading…
Reference in New Issue
Block a user