Skip to content

Commit 5bba98f

Browse files
committed
Additional fixes for tests
1 parent f7d7b26 commit 5bba98f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

scripts/reproduce-dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
# Dockerfile for containers to perform PR review in
22
# Use with make as follows: make RELEASE=v2.5.1 reproduce
33

4-
FROM centos:8
4+
FROM fedora:40
55

66
RUN dnf update -y
7-
RUN yum install epel-release -y
8-
RUN dnf install python38 vim git gcc gcc-c++ cmake make libuuid-devel libfaketime sudo man gdb -y
7+
RUN dnf install vim git gcc gcc-c++ cmake make libuuid-devel libfaketime sudo man gdb gnutls-devel rustup -y
98

109
RUN useradd warrior
1110
RUN echo warrior ALL=NOPASSWD:ALL > /etc/sudoers.d/warrior
1211

1312
USER warrior
1413
WORKDIR /home/warrior/
1514

15+
RUN rustup-init -y
16+
ENV PATH="$PATH:/home/warrior/.cargo/bin"
17+
1618
# Setup taskwarrior
1719
# The purpose is to speed up subsequent re-installs due to Docker layer caching
1820
RUN git clone https://github.com/GothenburgBitFactory/taskwarrior.git

test/basetest/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
3030

3131
# From the CMAKE value of the same name. This is substituted at configure.
32-
CMAKE_BINARY_DIR = os.path.abspath("${CMAKE_BINARY_DIR}")
32+
CMAKE_BINARY_DIR = os.path.abspath("/home/tbabej/Projects/taskwarrior")
3333

3434
# Location of binary files (usually the src/ folder)
3535
BIN_PREFIX = os.path.abspath(os.path.join(CMAKE_BINARY_DIR, "src"))
3636

3737
# Default location of test hooks
3838
DEFAULT_HOOK_PATH = os.path.abspath(
39-
os.path.join("${CMAKE_SOURCE_DIR}", "test", "test_hooks")
39+
os.path.join("/home/tbabej/Projects/taskwarrior", "test", "test_hooks")
4040
)
4141

4242
# Source directory
43-
SOURCE_DIR = os.path.abspath("${CMAKE_SOURCE_DIR}")
43+
SOURCE_DIR = os.path.abspath("/home/tbabej/Projects/taskwarrior")
4444

4545

4646
# Environment flags to control skipping of task tests

0 commit comments

Comments
 (0)