Description: Further unsigned-char fixes
 Test pattern updates.
 .
 cbmc (5.84.0-6) unstable; urgency=low
 .
   * Fix further portability problems (Closes: #1038866)
Author: Michael Tautschnig <mt@debian.org>
Bug-Debian: https://bugs.debian.org/1038866

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2023-06-25

--- cbmc-5.84.0.orig/regression/goto-instrument-json/rol_signed/test-signed.desc
+++ cbmc-5.84.0/regression/goto-instrument-json/rol_signed/test-signed.desc
@@ -3,7 +3,7 @@ test-signed.json
 --dump-c
 ^EXIT=0$
 ^SIGNAL=0$
-signed char rol8=\(unsigned char\)'8' << 3 % 8 \| \(unsigned char\)'8' >> 8 - 3 % 8;
+signed char rol8=\(unsigned char\)('8'|56) << 3 % 8 \| \(unsigned char\)('8'|56) >> 8 - 3 % 8;
 --
 irep
 --
--- cbmc-5.84.0.orig/regression/goto-instrument-json/rol_unsigned/test.desc
+++ cbmc-5.84.0/regression/goto-instrument-json/rol_unsigned/test.desc
@@ -3,7 +3,7 @@ test.json
 --dump-c
 ^EXIT=0$
 ^SIGNAL=0$
-unsigned char rol8=56 << 3 % 8 \| 56 >> 8 - 3 % 8;
+unsigned char rol8=(56|'8') << 3 % 8 \| (56|'8') >> 8 - 3 % 8;
 --
 irep
 --
--- cbmc-5.84.0.orig/regression/goto-instrument-json/ror_signed/test-signed.desc
+++ cbmc-5.84.0/regression/goto-instrument-json/ror_signed/test-signed.desc
@@ -3,7 +3,7 @@ test-signed.json
 --dump-c
 ^EXIT=0$
 ^SIGNAL=0$
-signed char ror8=\(unsigned char\)'8' >> 3 % 8 \| \(unsigned char\)'8' << 8 - 3 % 8;
+signed char ror8=\(unsigned char\)('8'|56) >> 3 % 8 \| \(unsigned char\)('8'|56) << 8 - 3 % 8;
 --
 irep
 --
--- cbmc-5.84.0.orig/regression/goto-instrument-json/ror_unsigned/test.desc
+++ cbmc-5.84.0/regression/goto-instrument-json/ror_unsigned/test.desc
@@ -3,7 +3,7 @@ test.json
 --dump-c
 ^EXIT=0$
 ^SIGNAL=0$
-unsigned char ror8=56 >> 3 % 8 \| 56 << 8 - 3 % 8;
+unsigned char ror8=(56|'8') >> 3 % 8 \| (56|'8') << 8 - 3 % 8;
 --
 irep
 --
