Skip to content

GitLab

M
mesa
Commit f5e70410 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Fixed tests

parent ef8851f2
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
Makefile
View file @ f5e70410
virgl: virgl:
tar xf mesa-20.1.1.tar.xz tar xf mesa-20.1.1.tar.xz
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-fix_tests.patch
mkdir -p mesa-20.1.1/build mkdir -p mesa-20.1.1/build
cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=virgl,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true .. cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=virgl,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true ..
cd mesa-20.1.1/build && ninja cd mesa-20.1.1/build && ninja
...@@ -13,6 +14,7 @@ virgl: ...@@ -13,6 +14,7 @@ virgl:
iris: iris:
tar xf mesa-20.1.1.tar.xz tar xf mesa-20.1.1.tar.xz
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-fix_tests.patch
mkdir -p mesa-20.1.1/build mkdir -p mesa-20.1.1/build
cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=iris,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true .. cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=iris,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true ..
cd mesa-20.1.1/build && ninja cd mesa-20.1.1/build && ninja
...@@ -25,6 +27,7 @@ iris: ...@@ -25,6 +27,7 @@ iris:
radeonsi: radeonsi:
tar xf mesa-20.1.1.tar.xz tar xf mesa-20.1.1.tar.xz
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-fix_tests.patch
mkdir -p mesa-20.1.1/build mkdir -p mesa-20.1.1/build
cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=radeonsi,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true .. cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=radeonsi,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true ..
cd mesa-20.1.1/build && ninja cd mesa-20.1.1/build && ninja
...@@ -37,6 +40,7 @@ radeonsi: ...@@ -37,6 +40,7 @@ radeonsi:
vc4: vc4:
tar xf mesa-20.1.1.tar.xz tar xf mesa-20.1.1.tar.xz
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-fix_tests.patch
mkdir -p mesa-20.1.1/build mkdir -p mesa-20.1.1/build
cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=vc4,kmsro,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true .. cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=vc4,kmsro,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true ..
cd mesa-20.1.1/build && ninja cd mesa-20.1.1/build && ninja
...@@ -49,6 +53,7 @@ vc4: ...@@ -49,6 +53,7 @@ vc4:
lima: lima:
tar xf mesa-20.1.1.tar.xz tar xf mesa-20.1.1.tar.xz
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-fix_tests.patch
mkdir -p mesa-20.1.1/build mkdir -p mesa-20.1.1/build
cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=lima,kmsro,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true .. cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=lima,kmsro,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true ..
cd mesa-20.1.1/build && ninja cd mesa-20.1.1/build && ninja
...@@ -61,6 +66,7 @@ lima: ...@@ -61,6 +66,7 @@ lima:
panfrost: panfrost:
tar xf mesa-20.1.1.tar.xz tar xf mesa-20.1.1.tar.xz
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-python3.patch
patch -Np1 -d mesa-20.1.1 < mesa-20.1.1-fix_tests.patch
mkdir -p mesa-20.1.1/build mkdir -p mesa-20.1.1/build
cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=panfrost,kmsro,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true .. cd mesa-20.1.1/build && meson --prefix=$(XORG_PREFIX) -Dbuildtype=release -Ddri-drivers= -Dgallium-drivers=panfrost,kmsro,swrast -Dvulkan-drivers= -Dplatforms=drm,x11,wayland -Dgallium-nine=false -Dglx=dri -Dosmesa=classic -Dvalgrind=false -Dbuild-tests=true ..
cd mesa-20.1.1/build && ninja cd mesa-20.1.1/build && ninja
......
mesa-20.1.1-fix_tests.patch 0 → 100644
View file @ f5e70410
diff -uNr mesa-20.1.1/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected mesa-20.1.1-fix_tests/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected
--- mesa-20.1.1/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected 2020-06-11 03:33:00.434698800 +0930
+++ mesa-20.1.1-fix_tests/src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected 2021-07-28 13:55:25.700782781 +0930
@@ -1,2 +1,2 @@
-0:2(8): preprocessor error: syntax error, unexpected $end
+0:2(8): preprocessor error: syntax error, unexpected end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment