From 8987f68e103f0b690d7231d11e886c6f1acda536 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 17 Jan 2024 02:14:57 +0100 Subject: [PATCH] WIP --- .github/workflows/cross.yml | 2 +- dev/gaptest.expect | 2 +- dev/gaptest2.expect | 2 +- etc/ffgen.c | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index 3746ccc9e1b..a3b57e035da 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -138,7 +138,7 @@ jobs: run: make -j2 V=1 - name: Fixup sysinfo.gap - run: make SYSINFO_CC=gcc SYSINFO_CXX=g++ sysinfo.gap + run: rm sysinfo.gap && make SYSINFO_CC=gcc SYSINFO_CXX=g++ sysinfo.gap - name: Download required GAP packages run: make bootstrap-pkg-minimal diff --git a/dev/gaptest.expect b/dev/gaptest.expect index 288135e978f..b08f2cea60c 100644 --- a/dev/gaptest.expect +++ b/dev/gaptest.expect @@ -1,4 +1,4 @@ -set timeout 10 +set timeout 30 # from https://serverfault.com/a/981762 expect_before { diff --git a/dev/gaptest2.expect b/dev/gaptest2.expect index 1823eab1206..e7e1429cdd7 100644 --- a/dev/gaptest2.expect +++ b/dev/gaptest2.expect @@ -1,4 +1,4 @@ -set timeout 10 +set timeout 30 # from https://serverfault.com/a/981762 expect_before { diff --git a/etc/ffgen.c b/etc/ffgen.c index 40b7764bb80..441b6202909 100644 --- a/etc/ffgen.c +++ b/etc/ffgen.c @@ -144,8 +144,7 @@ void emit_code(FILE * dest, int header) void emit_code_to_file_by_basename(int header, char * basename) { - const len = strlen(basename) + 3; - char * filename = malloc(len); + char * filename = malloc(strlen(basename) + 3); strcpy(filename, basename); strcat(filename, header ? ".h" : ".c"); FILE * f = fopen(filename, "w");