Skip to content

Commit e7f1e28

Browse files
author
Mark R. Tuttle
committed
Repair debian builds by patching debian 64bit_regression_tests patch.
1 parent 760bffe commit e7f1e28

File tree

3 files changed

+28
-22
lines changed

3 files changed

+28
-22
lines changed

‎.github/workflows/debian/64bit_regression_tests.patch

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--- 64bit_regression_tests 2020-06-19 16:40:45.963502746 +0000
2+
+++ 64bit_regression_tests_patch 2020-06-19 16:42:12.338994730 +0000
3+
@@ -147,14 +147,14 @@
4+
--harness-type call-function --function test --treat-pointer-as-array arr --associated-array-size arr:sz
5+
^EXIT=0$
6+
^SIGNAL=0$
7+
--\[test.pointer_dereference.1\] line \d+ dereference failure: pointer NULL in arr\[\(signed( long)* int\)i\]: SUCCESS
8+
--\[test.pointer_dereference.2\] line \d+ dereference failure: pointer invalid in arr\[\(signed( long)* int\)i\]: SUCCESS
9+
+-\[test.pointer_dereference.1\] line \d+ dereference failure: pointer invalid in arr\[\(signed( long)* int\)i\]: SUCCESS
10+
+-\[test.pointer_dereference.2\] line \d+ dereference failure: pointer NULL in arr\[\(signed( long)* int\)i\]: SUCCESS
11+
-\[test.pointer_dereference.3\] line \d+ dereference failure: deallocated dynamic object in arr\[\(signed( long)* int\)i\]: SUCCESS
12+
-\[test.pointer_dereference.4\] line \d+ dereference failure: dead object in arr\[\(signed( long)* int\)i\]: SUCCESS
13+
-\[test.pointer_dereference.5\] line \d+ dereference failure: pointer outside dynamic object bounds in arr\[\(signed( long)* int\)i\]: SUCCESS
14+
-\[test.pointer_dereference.6\] line \d+ dereference failure: pointer outside object bounds in arr\[\(signed( long)* int\)i\]: SUCCESS
15+
-+\[test.pointer_dereference.1\] line \d+ dereference failure: pointer NULL in arr\[(\(signed( long)* int\))?i\]: SUCCESS
16+
-+\[test.pointer_dereference.2\] line \d+ dereference failure: pointer invalid in arr\[(\(signed( long)* int\))?i\]: SUCCESS
17+
++\[test.pointer_dereference.1\] line \d+ dereference failure: pointer invalid in arr\[(\(signed( long)* int\))?i\]: SUCCESS
18+
++\[test.pointer_dereference.2\] line \d+ dereference failure: pointer NULL in arr\[(\(signed( long)* int\))?i\]: SUCCESS
19+
+\[test.pointer_dereference.3\] line \d+ dereference failure: deallocated dynamic object in arr\[(\(signed( long)* int\))?i\]: SUCCESS
20+
+\[test.pointer_dereference.4\] line \d+ dereference failure: dead object in arr\[(\(signed( long)* int\))?i\]: SUCCESS
21+
+\[test.pointer_dereference.5\] line \d+ dereference failure: pointer outside dynamic object bounds in arr\[(\(signed( long)* int\))?i\]: SUCCESS

‎.github/workflows/debian/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@ patch-debian-patches: $(SRCDIR)/debian
237237
sed -i "s/<version>SUREFIRE<\/version>/<version>$$SUREFIRE_VERSION<\/version>/" \
238238
$(SRCDIR)/debian/patches/surefire
239239

240+
# Patch 64bit_regression_tests patch
241+
cd $(SRCDIR)/debian/patches && patch < ../../../64bit_regression_tests.patch
242+
240243
# Refresh all patches with quilt
241244
sudo apt-get -y install quilt
242245
cd $(SRCDIR) && export QUILT_PATCHES=debian/patches && \

‎.github/workflows/packages.yaml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,8 @@ jobs:
9595
- name: Create the package
9696
run: |
9797
cp -r . /tmp/cbmc-${CBMC_VERSION}
98-
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire /tmp
99-
df -m /tmp
100-
ls /tmp
98+
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire ${SCRIPT_DIR}/64bit_regression_tests.patch /tmp
10199
make -C /tmp GITHUB=1 STABLE=1 CBMC_VERSION=${CBMC_VERSION} PKG_VERSION=${PKG_VERSION}
102-
df -m /tmp
103-
ls /tmp
104100
mv /tmp/*.deb ${PACKAGE_STABLE_NAME}
105101
106102
- name: Upload the package
@@ -135,13 +131,8 @@ jobs:
135131
- name: Create the package
136132
run: |
137133
cp -r . /tmp/cbmc-${CBMC_VERSION}
138-
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire /tmp
139-
df -m /tmp
140-
ls /tmp
141-
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog /tmp
134+
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire ${SCRIPT_DIR}/64bit_regression_tests.patch /tmp
142135
make -C /tmp GITHUB=1 STABLE= CBMC_VERSION=${CBMC_VERSION} PKG_VERSION=${PKG_VERSION}
143-
df -m /tmp
144-
ls /tmp
145136
mv /tmp/*.deb ${PACKAGE_LATEST_NAME}
146137
147138
- name: Upload the package
@@ -176,12 +167,8 @@ jobs:
176167
- name: Create the package
177168
run: |
178169
cp -r . /tmp/cbmc-${CBMC_VERSION}
179-
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire /tmp
180-
df -m /tmp
181-
ls /tmp
170+
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire ${SCRIPT_DIR}/64bit_regression_tests.patch /tmp
182171
make -C /tmp GITHUB=1 STABLE=1 CBMC_VERSION=${CBMC_VERSION} PKG_VERSION=${PKG_VERSION}
183-
df -m /tmp
184-
ls /tmp
185172
mv /tmp/*.deb ${PACKAGE_STABLE_NAME}
186173
187174
- name: Upload the package
@@ -216,13 +203,8 @@ jobs:
216203
- name: Create the package
217204
run: |
218205
cp -r . /tmp/cbmc-${CBMC_VERSION}
219-
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire /tmp
220-
df -m /tmp
221-
ls /tmp
222-
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog /tmp
206+
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire ${SCRIPT_DIR}/64bit_regression_tests.patch /tmp
223207
make -C /tmp GITHUB=1 STABLE= CBMC_VERSION=${CBMC_VERSION} PKG_VERSION=${PKG_VERSION}
224-
df -m /tmp
225-
ls /tmp
226208
mv /tmp/*.deb ${PACKAGE_LATEST_NAME}
227209
228210
- name: Upload the package

0 commit comments

Comments
 (0)