From ac21f05a6c06b6a9506a2aff894f7c6e9a1a2848 Mon Sep 17 00:00:00 2001 From: bluhm Date: Thu, 18 Nov 2021 14:55:38 +0000 Subject: [PATCH] Remove X11 blt and bltone regress tests. They fail with the current X server and have been unlinked from the build. Converting the tests from libfb to libwfb could be possible, but nobody is working on that. OK matthieu@ kettenis@ --- regress/misc/X11/Makefile | 7 ---- regress/misc/X11/blt/Makefile | 8 ----- regress/misc/X11/blt/blt.c | 60 -------------------------------- regress/misc/X11/bltone/Makefile | 8 ----- regress/misc/X11/bltone/bltone.c | 59 ------------------------------- 5 files changed, 142 deletions(-) delete mode 100644 regress/misc/X11/Makefile delete mode 100644 regress/misc/X11/blt/Makefile delete mode 100644 regress/misc/X11/blt/blt.c delete mode 100644 regress/misc/X11/bltone/Makefile delete mode 100644 regress/misc/X11/bltone/bltone.c diff --git a/regress/misc/X11/Makefile b/regress/misc/X11/Makefile deleted file mode 100644 index eb7c350253b..00000000000 --- a/regress/misc/X11/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2005/08/31 20:53:49 kettenis Exp $ - -SUBDIR+= blt bltone - -install: - -.include diff --git a/regress/misc/X11/blt/Makefile b/regress/misc/X11/blt/Makefile deleted file mode 100644 index 960ba1486be..00000000000 --- a/regress/misc/X11/blt/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: Makefile,v 1.3 2017/07/29 12:45:56 bluhm Exp $ - -PROG= blt -LDADD+= -L/usr/X11R6/lib -L/usr/X11R6/lib/modules -lfb -LDADD+= -Wl,-rpath /usr/X11R6/lib/modules -LDADD+= -Wl,--allow-shlib-undefined - -.include diff --git a/regress/misc/X11/blt/blt.c b/regress/misc/X11/blt/blt.c deleted file mode 100644 index ba7541e5b6d..00000000000 --- a/regress/misc/X11/blt/blt.c +++ /dev/null @@ -1,60 +0,0 @@ -/* $OpenBSD: blt.c,v 1.4 2017/02/25 07:28:32 jsg Exp $ */ -/* - * Written by Mark Kettenis 2004 Public Domain - */ - -#include -#include - -#include -#include -#include -#include - -typedef unsigned FbStip; -typedef unsigned FbBits; -typedef int FbStride; -typedef int Bool; - -extern void fbBlt (FbBits *, FbStride, int, FbBits *, FbStride, int, - int, int, int, FbBits, int, Bool, Bool); - -FbBits map[] = { 0x77ff7700, 0x11335577 }; - -int -main (void) -{ - int pagesize; - FbBits *src; - FbBits *dst; - int srcX, dstX; - int bpp; - int alu = 1; - FbBits pm = 0xffffffff; - - pagesize = getpagesize(); - - src = mmap(NULL, 2 * pagesize, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0); - assert(src != MAP_FAILED); - - dst = mmap(NULL, 2 * pagesize, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0); - assert(dst != MAP_FAILED); - - mprotect((char *)src + pagesize, pagesize, PROT_NONE); - src = (FbBits *)((char *)src + (pagesize - sizeof map)); - memcpy (src, map, sizeof map); - - for (bpp = 8; bpp <= 32; bpp += 8) - for (dstX = 0; dstX < 64; dstX += bpp) - for (srcX = 0; srcX < 32; srcX += bpp) - fbBlt(src, 1, srcX, dst, 256, dstX, - (32 - srcX), 2, alu, pm, bpp, 0, 0); - - for (bpp = 8; bpp <= 32; bpp += 8) - for (dstX = 0; dstX < 64; dstX += bpp) - for (srcX = 0; srcX < 32; srcX += bpp) - fbBlt(src, 1, srcX, dst, 256, dstX, - (64 - srcX), 1, alu, pm, bpp, 0, 0); - - return 0; -} diff --git a/regress/misc/X11/bltone/Makefile b/regress/misc/X11/bltone/Makefile deleted file mode 100644 index 9dbcb62aa6c..00000000000 --- a/regress/misc/X11/bltone/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: Makefile,v 1.3 2017/07/29 12:45:56 bluhm Exp $ - -PROG= bltone -LDADD+= -L/usr/X11R6/lib -L/usr/X11R6/lib/modules -lfb -LDADD+= -Wl,-rpath /usr/X11R6/lib/modules -LDADD+= -Wl,--allow-shlib-undefined - -.include diff --git a/regress/misc/X11/bltone/bltone.c b/regress/misc/X11/bltone/bltone.c deleted file mode 100644 index d3c30b60554..00000000000 --- a/regress/misc/X11/bltone/bltone.c +++ /dev/null @@ -1,59 +0,0 @@ -/* $OpenBSD: bltone.c,v 1.7 2017/07/29 12:45:56 bluhm Exp $ */ -/* - * Written by Mark Kettenis 2004 Public Domain - */ - -#include -#include - -#include -#include -#include -#include - -typedef unsigned FbStip; -typedef unsigned FbBits; -typedef int FbStride; - -extern void fbBltOne (FbStip *, FbStride, int, FbBits *, FbStride, int, int, - int, int, FbBits, FbBits, FbBits, FbBits); - -FbStip mask[] = { 0x77ff7700, 0x11335577 }; - -int -main (void) -{ - int pagesize; - FbStip *src; - FbBits *dst; - int srcX, dstX; - int dstBpp; - - pagesize = getpagesize(); - - src = mmap(NULL, 2 * pagesize, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0); - assert(src != MAP_FAILED); - - dst = mmap(NULL, 2 * pagesize, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0); - assert(dst != MAP_FAILED); - - mprotect((char *)src + pagesize, pagesize, PROT_NONE); - src = (FbStip *)((char *)src + (pagesize - sizeof mask)); - memcpy (src, mask, sizeof mask); - - for (dstBpp = 8; dstBpp <= 32; dstBpp += 8) - for (dstX = 0; dstX < 64; dstX += 8) - for (srcX = 0; srcX < 32; srcX++) - fbBltOne(src, 1, srcX, dst, 128, dstX, dstBpp, - (32 - srcX) * dstBpp, 2, - 0, 0, 0xffffffff, 0); - - for (dstBpp = 8; dstBpp <= 32; dstBpp += 8) - for (dstX = 0; dstX < 64; dstX += 8) - for (srcX = 0; srcX < 32; srcX++) - fbBltOne(src, 1, srcX, dst, 128, dstX, dstBpp, - (64 - srcX) * dstBpp, 1, - 0, 0, 0xffffffff, 0); - - return 0; -} -- 2.20.1