libtests: Avoid build system defined defines

Update #3818.

3 files changed, 91 insertions, 88 deletions

diff --git a/testsuites/libtests/dl06/init.c b/testsuites/libtests/dl06/init.c
index 6f03d01843..413ebf0d11 100644
--- a/testsuites/libtests/dl06/init.c
+++ b/testsuites/libtests/dl06/init.c
@@ -1,88 +1 @@
-/*
- * Copyright (c) 2014 Chris Johns <chrisj@rtems.org>.  All rights reserved.
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-  #include "config.h"
-#endif
-
-#include "tmacros.h"
-
-#include <errno.h>
-#include <string.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
-
-#include "dl-load.h"
-
-const char rtems_test_name[] = "libdl (RTL) 6";
-
-/* forward declarations to avoid warnings */
-static rtems_task Init(rtems_task_argument argument);
-
-#if DL06_PRE
-#include "dl06-pre-tar.h"
-#else
-#include "dl06-tar.h"
-#endif
-
-#define TARFILE_START dl06_tar
-#define TARFILE_SIZE  dl06_tar_size
-
-static int test(void)
-{
-  int ret;
-  ret = dl_load_test();
-  if (ret)
-    rtems_test_exit(ret);
-  return 0;
-}
-
-static void Init(rtems_task_argument arg)
-{
-  int te;
-
-  TEST_BEGIN();
-
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
-  if (te != 0)
-  {
-    printf("untar failed: %d\n", te);
-    rtems_test_exit(1);
-    exit (1);
-  }
-
-  test();
-
-  TEST_END();
-
-  rtems_test_exit(0);
-}
-
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
-
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
-
-#define CONFIGURE_MAXIMUM_TASKS 1
-
-#define CONFIGURE_MAXIMUM_SEMAPHORES 1
-
-#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_INIT_TASK_STACK_SIZE (8U * 1024U)
-
-#define CONFIGURE_INIT_TASK_ATTRIBUTES   (RTEMS_DEFAULT_ATTRIBUTES | RTEMS_FLOATING_POINT)
-
-#define CONFIGURE_INIT
-
-#include <rtems/confdefs.h>
+#include "initimpl.h"
diff --git a/testsuites/libtests/dl06/initimpl.h b/testsuites/libtests/dl06/initimpl.h
new file mode 100644
index 0000000000..6f03d01843
--- /dev/null
+++ b/testsuites/libtests/dl06/initimpl.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2014 Chris Johns <chrisj@rtems.org>.  All rights reserved.
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include "tmacros.h"
+
+#include <errno.h>
+#include <string.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <rtems/rtl/rtl.h>
+#include <rtems/untar.h>
+
+#include "dl-load.h"
+
+const char rtems_test_name[] = "libdl (RTL) 6";
+
+/* forward declarations to avoid warnings */
+static rtems_task Init(rtems_task_argument argument);
+
+#if DL06_PRE
+#include "dl06-pre-tar.h"
+#else
+#include "dl06-tar.h"
+#endif
+
+#define TARFILE_START dl06_tar
+#define TARFILE_SIZE  dl06_tar_size
+
+static int test(void)
+{
+  int ret;
+  ret = dl_load_test();
+  if (ret)
+    rtems_test_exit(ret);
+  return 0;
+}
+
+static void Init(rtems_task_argument arg)
+{
+  int te;
+
+  TEST_BEGIN();
+
+  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  if (te != 0)
+  {
+    printf("untar failed: %d\n", te);
+    rtems_test_exit(1);
+    exit (1);
+  }
+
+  test();
+
+  TEST_END();
+
+  rtems_test_exit(0);
+}
+
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
+
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 4
+
+#define CONFIGURE_MAXIMUM_TASKS 1
+
+#define CONFIGURE_MAXIMUM_SEMAPHORES 1
+
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT_TASK_STACK_SIZE (8U * 1024U)
+
+#define CONFIGURE_INIT_TASK_ATTRIBUTES   (RTEMS_DEFAULT_ATTRIBUTES | RTEMS_FLOATING_POINT)
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/libtests/dl06/pre-init.c b/testsuites/libtests/dl06/pre-init.c
new file mode 100644
index 0000000000..6dc232a574
--- /dev/null
+++ b/testsuites/libtests/dl06/pre-init.c
@@ -0,0 +1,2 @@
+#define DL06_PRE 1
+#include "initimpl.h"