Merge branch 'divVerent/ftypeless-stores' of git://git.xonotic.org/xonotic/gmqcc...

diff --git a/test.c b/test.c
index 7006b4a5bc2011c256de9c99656322f0c5fbb952..6fdee5134de3d07d85738035f881d62b2234a1a8 100644 (file)
--- a/test.c
+++ b/test.c
@@ -445,9 +445,6 @@ static bool task_template_parse(const char *file, task_template_t *tmpl, FILE *f
                     goto failure;
                 }
 
-                if (value && (*value == ' ' || *value == '\t'))
-                    value++;
-
                 /*
                  * Value will contain a newline character at the end, we need to strip
                  * this otherwise kaboom, seriously, kaboom :P

diff --git a/tests/correct-logic-1-s.tmpl b/tests/correct-logic-1-s.tmpl
index e3f3451581a5b5f1d8caeae6d58ced2dc3f44a4e..8406ab7ec3e2a004489ec15ea5f2c4de7215623c 100644 (file)
--- a/tests/correct-logic-1-s.tmpl
+++ b/tests/correct-logic-1-s.tmpl
@@ -2,7 +2,7 @@ I: correct-logic.qc
 D: vector logic flags
 T: -execute
 C: -std=fteqcc -fshort-logic
-M:          ! & | i N
+M:         ! & | i N
 M: 0, 0 -> 1 0 0 0 1
 M: 0, x -> 1 0 1 0 1
 M: x, 0 -> 0 0 1 1 0

diff --git a/tests/correct-logic-1.tmpl b/tests/correct-logic-1.tmpl
index b151f460af89f2aa2036a98bc284b4a2c3330bb2..c007ffbaf8e56f3700c9303b5556d2f540d2df5c 100644 (file)
--- a/tests/correct-logic-1.tmpl
+++ b/tests/correct-logic-1.tmpl
@@ -2,7 +2,7 @@ I: correct-logic.qc
 D: vector logic flags
 T: -execute
 C: -std=fteqcc
-M:          ! & | i N
+M:         ! & | i N
 M: 0, 0 -> 1 0 0 0 1
 M: 0, x -> 1 0 1 0 1
 M: x, 0 -> 0 0 1 1 0

diff --git a/tests/correct-logic-2-s.tmpl b/tests/correct-logic-2-s.tmpl
index a7ada6e40e80448cd55a852fa2494b0b4d988bd4..b1ce6889e76f5817dd5f0dfdbdf3dc4bd386576f 100644 (file)
--- a/tests/correct-logic-2-s.tmpl
+++ b/tests/correct-logic-2-s.tmpl
@@ -2,7 +2,7 @@ I: correct-logic.qc
 D: vector logic flags
 T: -execute
 C: -std=fteqcc -fcorrect-logic -fshort-logic
-M:          ! & | i N
+M:         ! & | i N
 M: 0, 0 -> 1 0 0 0 1
 M: 0, x -> 1 0 1 0 1
 M: x, 0 -> 0 0 1 1 0

diff --git a/tests/correct-logic-2.tmpl b/tests/correct-logic-2.tmpl
index 7ecd3df1473358ba4060fe7cd507f779a5dfc6b1..2e79ec3c021da2d65cb3c40f4c6be381e1ff443f 100644 (file)
--- a/tests/correct-logic-2.tmpl
+++ b/tests/correct-logic-2.tmpl
@@ -2,7 +2,7 @@ I: correct-logic.qc
 D: vector logic flags
 T: -execute
 C: -std=fteqcc -fcorrect-logic
-M:          ! & | i N
+M:         ! & | i N
 M: 0, 0 -> 1 0 0 0 1
 M: 0, x -> 1 0 1 0 1
 M: x, 0 -> 0 0 1 1 0

diff --git a/tests/truth-flags-1-s.tmpl b/tests/truth-flags-1-s.tmpl
index 770f306eb68439a617a71708d8bb07b567667a5d..90d3affa74ee597ef40716a22a442fc8c58b044f 100644 (file)
--- a/tests/truth-flags-1-s.tmpl
+++ b/tests/truth-flags-1-s.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -fshort-logic
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 1 1 1 0
 M: 'str', 0     -> 0 0 1 1 0

diff --git a/tests/truth-flags-1.tmpl b/tests/truth-flags-1.tmpl
index 7562374a89f85ca60693e3ebeeef3750162c15cc..93dfda3eacc59985f3abcd53eb58bf3f8b21768b 100644 (file)
--- a/tests/truth-flags-1.tmpl
+++ b/tests/truth-flags-1.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 1 1 1 0
 M: 'str', 0     -> 0 0 1 1 0

diff --git a/tests/truth-flags-2-s.tmpl b/tests/truth-flags-2-s.tmpl
index 3de75ebf0777e7d7a8f77ffd9be0fd3f4c68b3fe..d964488d2ac563fc10e4c09ebc2a5530e7486246 100644 (file)
--- a/tests/truth-flags-2-s.tmpl
+++ b/tests/truth-flags-2-s.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -fshort-logic -ftrue-empty-strings
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 1 1 1 0
 M: 'str', 0     -> 0 0 1 1 0

diff --git a/tests/truth-flags-2.tmpl b/tests/truth-flags-2.tmpl
index d9bb543547d82368941d8a06f1f4a29b6402a2d1..7e422217e8ed59a935c6fe89f377998c2f2de3e0 100644 (file)
--- a/tests/truth-flags-2.tmpl
+++ b/tests/truth-flags-2.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -ftrue-empty-strings
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 1 1 1 0
 M: 'str', 0     -> 0 0 1 1 0

diff --git a/tests/truth-flags-3-s.tmpl b/tests/truth-flags-3-s.tmpl
index 1ebd56ba814da79cca7a05dcefb45a09e6feacfd..ec9808dfdb7ccb294f3958faf83bfb726151be07 100644 (file)
--- a/tests/truth-flags-3-s.tmpl
+++ b/tests/truth-flags-3-s.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -fshort-logic -ffalse-empty-strings
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 0 1 1 0
 M: 'str', 0     -> 0 0 1 1 0

diff --git a/tests/truth-flags-3.tmpl b/tests/truth-flags-3.tmpl
index f166ddaaeb4538b1183a4bab194b00f758eff5e2..a70f38da5b0a1cb5235225e2cabb94019d7f9cdb 100644 (file)
--- a/tests/truth-flags-3.tmpl
+++ b/tests/truth-flags-3.tmpl
@@ -2,7 +2,7 @@ I: truth-flags-2.qc
 D: logic flags
 T: -execute
 C: -std=fteqcc -ffalse-empty-strings
-M:                  ! & | i N
+M:                 ! & | i N
 M: 'str', 'str' -> 0 1 1 1 0
 M: 'str', ''    -> 0 0 1 1 0
 M: 'str', 0     -> 0 0 1 1 0