[rtems commit] fstests: Use tmacros.h instead of pmacros.h
Sebastian Huber
sebh at rtems.org
Tue Nov 12 09:07:05 UTC 2019
Module: rtems
Branch: master
Commit: b88c7583b8f54b2612424dc46d4fb52021d0cf26
Changeset: http://git.rtems.org/rtems/commit/?id=b88c7583b8f54b2612424dc46d4fb52021d0cf26
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Mon Nov 11 14:24:45 2019 +0100
fstests: Use tmacros.h instead of pmacros.h
This avoids an extra include path.
Update #3818.
---
testsuites/fstests/Makefile.am | 3 +--
testsuites/fstests/fserror/test.c | 2 +-
testsuites/fstests/fslink/test.c | 2 +-
testsuites/fstests/fspatheval/test.c | 2 +-
testsuites/fstests/fspermission/test.c | 2 +-
testsuites/fstests/fsrdwr/init.c | 2 +-
testsuites/fstests/fsrename/test.c | 2 +-
testsuites/fstests/fsstatvfs/test.c | 2 +-
testsuites/fstests/fssymlink/test.c | 2 +-
testsuites/fstests/fstime/test.c | 2 +-
testsuites/fstests/imfs_support/fs_support.c | 2 +-
testsuites/fstests/jffs2_support/fs_support.c | 2 +-
testsuites/fstests/mdosfs_support/fs_support.c | 2 +-
testsuites/fstests/mimfs_support/fs_support.c | 2 +-
testsuites/fstests/mrfs_support/fs_support.c | 2 +-
testsuites/fstests/support/fstest_support.c | 2 +-
16 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/testsuites/fstests/Makefile.am b/testsuites/fstests/Makefile.am
index 3e787bc..9924b71 100644
--- a/testsuites/fstests/Makefile.am
+++ b/testsuites/fstests/Makefile.am
@@ -12,8 +12,7 @@ fs_screens =
fs_docs =
support_includes = -I$(top_srcdir)/../support/include
-test_includes = -I$(top_srcdir)/support \
- -I$(top_srcdir)/../psxtests/include
+test_includes = -I$(top_srcdir)/support
if TEST_fsbdpart01
fs_tests += fsbdpart01
diff --git a/testsuites/fstests/fserror/test.c b/testsuites/fstests/fserror/test.c
index c53aff8..cd31a18 100644
--- a/testsuites/fstests/fserror/test.c
+++ b/testsuites/fstests/fserror/test.c
@@ -23,7 +23,7 @@
#include "fstest.h"
#include "fs_config.h"
-#include "pmacros.h"
+#include <tmacros.h>
const char rtems_test_name[] = "FSERROR " FILESYSTEM;
diff --git a/testsuites/fstests/fslink/test.c b/testsuites/fstests/fslink/test.c
index b65322b..f92160b 100644
--- a/testsuites/fstests/fslink/test.c
+++ b/testsuites/fstests/fslink/test.c
@@ -24,7 +24,7 @@
#include "fstest.h"
#include "fs_config.h"
-#include "pmacros.h"
+#include <tmacros.h>
const char rtems_test_name[] = "FSLINK " FILESYSTEM;
diff --git a/testsuites/fstests/fspatheval/test.c b/testsuites/fstests/fspatheval/test.c
index 5b9e40a..7938946 100644
--- a/testsuites/fstests/fspatheval/test.c
+++ b/testsuites/fstests/fspatheval/test.c
@@ -22,7 +22,7 @@
#include "fstest.h"
#include "fs_config.h"
-#include "pmacros.h"
+#include <tmacros.h>
#define BUF_SIZE 100
diff --git a/testsuites/fstests/fspermission/test.c b/testsuites/fstests/fspermission/test.c
index 36675ac..53a83ed 100644
--- a/testsuites/fstests/fspermission/test.c
+++ b/testsuites/fstests/fspermission/test.c
@@ -23,7 +23,7 @@
#include "fstest.h"
#include "fs_config.h"
-#include "pmacros.h"
+#include <tmacros.h>
const char rtems_test_name[] = "FSPERMISSION " FILESYSTEM;
diff --git a/testsuites/fstests/fsrdwr/init.c b/testsuites/fstests/fsrdwr/init.c
index b801b94..02b88c9 100644
--- a/testsuites/fstests/fsrdwr/init.c
+++ b/testsuites/fstests/fsrdwr/init.c
@@ -24,7 +24,7 @@
#include "fstest.h"
#include "fs_config.h"
-#include "pmacros.h"
+#include <tmacros.h>
const char rtems_test_name[] = "FSRDWR " FILESYSTEM;
diff --git a/testsuites/fstests/fsrename/test.c b/testsuites/fstests/fsrename/test.c
index 6799ab4..d5acb70 100644
--- a/testsuites/fstests/fsrename/test.c
+++ b/testsuites/fstests/fsrename/test.c
@@ -14,7 +14,7 @@
#include "fstest.h"
#include "fs_config.h"
#include "fstest_support.h"
-#include "pmacros.h"
+#include <tmacros.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/testsuites/fstests/fsstatvfs/test.c b/testsuites/fstests/fsstatvfs/test.c
index 0791efe..5314749 100644
--- a/testsuites/fstests/fsstatvfs/test.c
+++ b/testsuites/fstests/fsstatvfs/test.c
@@ -16,7 +16,7 @@
#include "fstest.h"
#include "fs_config.h"
-#include "pmacros.h"
+#include <tmacros.h>
const char rtems_test_name[] = "FSSTATVFS " FILESYSTEM;
diff --git a/testsuites/fstests/fssymlink/test.c b/testsuites/fstests/fssymlink/test.c
index ec5698f..7e90ebc 100644
--- a/testsuites/fstests/fssymlink/test.c
+++ b/testsuites/fstests/fssymlink/test.c
@@ -24,7 +24,7 @@
#include "fstest.h"
#include "fs_config.h"
-#include "pmacros.h"
+#include <tmacros.h>
const char rtems_test_name[] = "FSSYMLINK " FILESYSTEM;
diff --git a/testsuites/fstests/fstime/test.c b/testsuites/fstests/fstime/test.c
index 7885373..5fa4193 100644
--- a/testsuites/fstests/fstime/test.c
+++ b/testsuites/fstests/fstime/test.c
@@ -25,7 +25,7 @@
#ifdef __rtems__
#include "fstest.h"
#include "fs_config.h"
-#include "pmacros.h"
+#include <tmacros.h>
const char rtems_test_name[] = "FSTIME " FILESYSTEM;
#else
diff --git a/testsuites/fstests/imfs_support/fs_support.c b/testsuites/fstests/imfs_support/fs_support.c
index eec9a49..04b8982 100644
--- a/testsuites/fstests/imfs_support/fs_support.c
+++ b/testsuites/fstests/imfs_support/fs_support.c
@@ -9,7 +9,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "pmacros.h"
+#include <tmacros.h>
#include <sys/stat.h>
diff --git a/testsuites/fstests/jffs2_support/fs_support.c b/testsuites/fstests/jffs2_support/fs_support.c
index 666d023..a855c8e 100644
--- a/testsuites/fstests/jffs2_support/fs_support.c
+++ b/testsuites/fstests/jffs2_support/fs_support.c
@@ -15,7 +15,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "pmacros.h"
+#include <tmacros.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/testsuites/fstests/mdosfs_support/fs_support.c b/testsuites/fstests/mdosfs_support/fs_support.c
index 4395182..b43fca9 100644
--- a/testsuites/fstests/mdosfs_support/fs_support.c
+++ b/testsuites/fstests/mdosfs_support/fs_support.c
@@ -9,7 +9,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "pmacros.h"
+#include <tmacros.h>
#include "fs_config.h"
diff --git a/testsuites/fstests/mimfs_support/fs_support.c b/testsuites/fstests/mimfs_support/fs_support.c
index deec9dc..7e54199 100644
--- a/testsuites/fstests/mimfs_support/fs_support.c
+++ b/testsuites/fstests/mimfs_support/fs_support.c
@@ -10,7 +10,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "pmacros.h"
+#include <tmacros.h>
#include <sys/stat.h>
#include <rtems/libio.h>
diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c
index 24c82cb..0382bbb 100644
--- a/testsuites/fstests/mrfs_support/fs_support.c
+++ b/testsuites/fstests/mrfs_support/fs_support.c
@@ -10,7 +10,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "pmacros.h"
+#include <tmacros.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/testsuites/fstests/support/fstest_support.c b/testsuites/fstests/support/fstest_support.c
index eedda92..fcf1ef8 100644
--- a/testsuites/fstests/support/fstest_support.c
+++ b/testsuites/fstests/support/fstest_support.c
@@ -27,7 +27,7 @@
#include "fs_config.h"
#include "fstest.h"
-#include "pmacros.h"
+#include <tmacros.h>
void *volatile prevent_compiler_optimizations;
More information about the vc
mailing list