16 files changed, 12 insertions, 13 deletions
diff --git a/test cases/common/13 pch/c/meson.build b/test cases/common/13 pch/c/meson.build
new file mode 100644
index 000000000..cb8349da4
--- /dev/null
+++ b/test cases/common/13 pch/c/meson.build
@@ -0,0 +1,8 @@
+cc = meson.get_compiler('c')
+cc_id = cc.get_id()
+if cc_id == 'lcc'
+  error('MESON_SKIP_TEST: Elbrus compiler does not support PCH.')
+endif
+
+exe = executable('prog', 'prog.c',
+c_pch : ['pch/prog_pch.c', 'pch/prog.h'])
diff --git a/test cases/common/13 pch/pch/prog.h b/test cases/common/13 pch/c/pch/prog.h
index 354499acd..354499acd 100644
--- a/test cases/common/13 pch/pch/prog.h
+++ b/test cases/common/13 pch/c/pch/prog.h
diff --git a/test cases/common/13 pch/pch/prog_pch.c b/test cases/common/13 pch/c/pch/prog_pch.c
index 49605057b..49605057b 100644
--- a/test cases/common/13 pch/pch/prog_pch.c
+++ b/test cases/common/13 pch/c/pch/prog_pch.c
diff --git a/test cases/common/13 pch/prog.c b/test cases/common/13 pch/c/prog.c
index 0ce3d0a24..0ce3d0a24 100644
--- a/test cases/common/13 pch/prog.c
+++ b/test cases/common/13 pch/c/prog.c
diff --git a/test cases/common/14 cpp pch/meson.build b/test cases/common/13 pch/cpp/meson.build
index 6922fd7b6..802c3e13c 100644
--- a/test cases/common/14 cpp pch/meson.build
+++ b/test cases/common/13 pch/cpp/meson.build
@@ -1,2 +1 @@
-project('c++ pch test', 'cpp')
 exe = executable('prog', 'prog.cc', cpp_pch : ['pch/prog.hh', 'pch/prog_pch.cc'])
diff --git a/test cases/common/14 cpp pch/pch/prog.hh b/test cases/common/13 pch/cpp/pch/prog.hh
index 751cc4a71..751cc4a71 100644
--- a/test cases/common/14 cpp pch/pch/prog.hh
+++ b/test cases/common/13 pch/cpp/pch/prog.hh
diff --git a/test cases/common/14 cpp pch/pch/prog_pch.cc b/test cases/common/13 pch/cpp/pch/prog_pch.cc
index aff122589..aff122589 100644
--- a/test cases/common/14 cpp pch/pch/prog_pch.cc
+++ b/test cases/common/13 pch/cpp/pch/prog_pch.cc
diff --git a/test cases/common/14 cpp pch/prog.cc b/test cases/common/13 pch/cpp/prog.cc
index 629d88077..629d88077 100644
--- a/test cases/common/14 cpp pch/prog.cc
+++ b/test cases/common/13 pch/cpp/prog.cc
diff --git a/test cases/common/13 pch/meson.build b/test cases/common/13 pch/meson.build
index e144aa5a3..05b40370b 100644
--- a/test cases/common/13 pch/meson.build
+++ b/test cases/common/13 pch/meson.build
@@ -1,10 +1,5 @@
-project('pch test', 'c')
+project('pch test', 'c', 'cpp')
 
-cc = meson.get_compiler('c')
-cc_id = cc.get_id()
-if cc_id == 'lcc'
-  error('MESON_SKIP_TEST: Elbrus compiler does not support PCH.')
-endif
-
-exe = executable('prog', 'prog.c',
-c_pch : ['pch/prog_pch.c', 'pch/prog.h'])
+subdir('c')
+subdir('cpp')
+subdir('mixed')
diff --git a/test cases/common/15 mixed pch/func.c b/test cases/common/13 pch/mixed/func.c
index c02722e83..c02722e83 100644
--- a/test cases/common/15 mixed pch/func.c
+++ b/test cases/common/13 pch/mixed/func.c
diff --git a/test cases/common/15 mixed pch/main.cc b/test cases/common/13 pch/mixed/main.cc
index 44d049ed7..44d049ed7 100644
--- a/test cases/common/15 mixed pch/main.cc
+++ b/test cases/common/13 pch/mixed/main.cc
diff --git a/test cases/common/15 mixed pch/meson.build b/test cases/common/13 pch/mixed/meson.build
index 8e9da9397..7f6033dcf 100644
--- a/test cases/common/15 mixed pch/meson.build
+++ b/test cases/common/13 pch/mixed/meson.build
@@ -1,6 +1,3 @@
-project('mixed C and C++ pch test', 'cpp', 'c')
-
-
 exe = executable(
   'prog',
   files('main.cc', 'func.c'),
diff --git a/test cases/common/15 mixed pch/pch/func.h b/test cases/common/13 pch/mixed/pch/func.h
index 354499acd..354499acd 100644
--- a/test cases/common/15 mixed pch/pch/func.h
+++ b/test cases/common/13 pch/mixed/pch/func.h
diff --git a/test cases/common/15 mixed pch/pch/func_pch.c b/test cases/common/13 pch/mixed/pch/func_pch.c
index 556673988..556673988 100644
--- a/test cases/common/15 mixed pch/pch/func_pch.c
+++ b/test cases/common/13 pch/mixed/pch/func_pch.c
diff --git a/test cases/common/15 mixed pch/pch/main.h b/test cases/common/13 pch/mixed/pch/main.h
index 751cc4a71..751cc4a71 100644
--- a/test cases/common/15 mixed pch/pch/main.h
+++ b/test cases/common/13 pch/mixed/pch/main.h
diff --git a/test cases/common/15 mixed pch/pch/main_pch.cc b/test cases/common/13 pch/mixed/pch/main_pch.cc
index acd3f574b..acd3f574b 100644
--- a/test cases/common/15 mixed pch/pch/main_pch.cc
+++ b/test cases/common/13 pch/mixed/pch/main_pch.cc