From 0d8fb3dd774f3bfadc328a423039d934b158d3ef Mon Sep 17 00:00:00 2001
From: Heiko Reese <heiko.reese@kit.edu>
Date: Sat, 11 Sep 2021 12:23:15 +0200
Subject: [PATCH] debugging meson build tests

---
 .gitlab-ci.yml                                | 30 +++++++++----------
 ...ibexim-encrypt-dlfunc-decrypt-secretbox.sh |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31ef3a8..8a25446 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,31 +39,23 @@ stages:
             - ./*.changes
             - ./*.buildinfo
 
-build:buster:
-    extends:
-        - .build
-        - .image-buster
-    needs: []
-    
 build:bullseye:
     extends:
         - .image-bullseye
         - .build
-    needs: []
+    needs: [ ]
 
 build:focal:
     extends:
         - .image-focal
         - .build
-    needs: []
+    needs: [ ]
 
-debian-package:buster:
+build:buster:
     extends:
+        - .build
         - .image-buster
-        - .debian-package
-    dependencies:
-        - build:buster
-    needs: ["build:buster"]
+    needs: [ ]
 
 debian-package:bullseye:
     extends:
@@ -71,7 +63,7 @@ debian-package:bullseye:
         - .debian-package
     dependencies:
         - build:bullseye
-    needs: ["build:bullseye"]
+    needs: [ "build:bullseye" ]
 
 debian-package:focal:
     extends:
@@ -79,4 +71,12 @@ debian-package:focal:
         - .debian-package
     dependencies:
         - build:focal
-    needs: ["build:focal"]
+    needs: [ "build:focal" ]
+
+debian-package:buster:
+    extends:
+        - .image-buster
+        - .debian-package
+    dependencies:
+        - build:buster
+    needs: [ "build:buster" ]
diff --git a/src/test_libexim-encrypt-dlfunc-decrypt-secretbox.sh b/src/test_libexim-encrypt-dlfunc-decrypt-secretbox.sh
index 08de2f2..97a9d03 100755
--- a/src/test_libexim-encrypt-dlfunc-decrypt-secretbox.sh
+++ b/src/test_libexim-encrypt-dlfunc-decrypt-secretbox.sh
@@ -12,8 +12,8 @@ TEST_CIPHERTEXT01='RCHI+VukmWIsVE3eixbWIAtPPBW63nmV1ITpSBEDYXC9Y5QMBd1zmGLLhE+S9
 TEST_CIPHERTEXT02='sEG09WnEKIN2nyJYGNNVo14o7wV6X9HQxW+zxAxMLX9jVdashdaoHqLXQGM8lzpJhG6629lccjzAfrq8'
 CIPHERTEXT_FILE01="$(mktemp)"
 CIPHERTEXT_FILE02="$(mktemp)"
-echo "${TEST_CIPHERTEXT01}" > "${CIPHERTEXT_FILE01}"
-echo "${TEST_CIPHERTEXT02}" > "${CIPHERTEXT_FILE02}"
+echo -n "${TEST_CIPHERTEXT01}" > "${CIPHERTEXT_FILE01}"
+echo -n "${TEST_CIPHERTEXT02}" > "${CIPHERTEXT_FILE02}"
 
 DECRYPTED01="$(LIBEXIM_PASSWORD="${TEST_PASSWORD}" src/libexim-encrypt-dlfunc-decrypt-secretbox ${TEST_CIPHERTEXT01})"
 if [ "${DECRYPTED01}" == "${TEST_CLEARTEXT}" ] ; then