ci_prereq.sh: split test-only part

ci_prereq.sh

@@ -1,19 +1,10 @@
 #!/bin/sh
 
+sudo apt install -y \
+  devscripts \
+  equivs \
+  git
+
 sudo add-apt-repository ppa:stsp-0/nasm-segelf
 sudo add-apt-repository ppa:stsp-0/thunk-gen
-sudo apt update -q
-sudo apt install -y \
-    bison \
-    flex \
-    sed \
-    bash \
-    clang \
-    nasm-segelf \
-    thunk-gen \
-    binutils \
-    pkgconf \
-    autoconf \
-    libelf-dev \
-    git \
-    diffutils
+mk-build-deps --install --root-cmd sudo

ci_setup_test.sh

@@ -34,7 +34,8 @@ fi
   sed -i -e 's/fdpp-dev,/bash,/' debian/control
 
   # Use debian package build deps so we don't have to maintain a list here
-  sudo apt install devscripts equivs
+  sudo add-apt-repository ppa:stsp-0/dj64
+  sudo add-apt-repository -y ppa:dosemu2/ppa
   mk-build-deps --install --root-cmd sudo
 
   CC=clang ./default-configure -d \

ci_test.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+. ./ci_test_prereq.sh
+
 if [ -z "${DIR_TEST_DOSEMU}" ] ; then
    echo env var "DIR_TEST_DOSEMU" is empty or missing
    exit 1

ci_test_prereq.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sudo apt update -q
+sudo apt install -y \
+    diffutils