3 files changed, 21 insertions, 0 deletions
diff --git a/test cases/common/14 configure file/config10.h.in b/test cases/common/14 configure file/config10.h.in
new file mode 100644
index 000000000..6c0661a6a
--- /dev/null
+++ b/test cases/common/14 configure file/config10.h.in
@@ -0,0 +1,4 @@
+/* Should both be the same */
+#define MESSAGE1 "@var@"
+#define MESSAGE2 "${var}"
+
diff --git a/test cases/common/14 configure file/meson.build b/test cases/common/14 configure file/meson.build
index 036a562b7..3a4ff4dc9 100644
--- a/test cases/common/14 configure file/meson.build
+++ b/test cases/common/14 configure file/meson.build
@@ -331,6 +331,16 @@ configure_file(output : 'config9b.h',
 
 test('test9', executable('prog9', 'prog9.c'))
 
+# Test @ and curly braces at the same time with cmake format
+conf10 = configuration_data()
+conf10.set('var', 'foo')
+configure_file(
+  input : 'config10.h.in',
+  output : '@BASENAME@',
+  format : 'cmake',
+  configuration : conf10)
+test('test10', executable('prog10', 'prog10.c'))
+
 check_inputs = find_program('check_inputs.py')
 configure_file(output : 'check_inputs.txt',
   input : ['prog.c', files('prog2.c', 'prog4.c')],
diff --git a/test cases/common/14 configure file/prog10.c b/test cases/common/14 configure file/prog10.c
new file mode 100644
index 000000000..cdca6dae4
--- /dev/null
+++ b/test cases/common/14 configure file/prog10.c
@@ -0,0 +1,7 @@
+#include <string.h>
+#include <config10.h>
+
+int main(void) {
+    return strcmp(MESSAGE1, "foo")
+        || strcmp(MESSAGE2, "foo");
+}