[rtems commit] libtests/dl*: Use rtems_tarfs_load()

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    b8b954a3e9d2eaaa8b40a0d50263d171f088c634
Changeset: http://git.rtems.org/rtems/commit/?id=b8b954a3e9d2eaaa8b40a0d50263d171f088c634

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Nov 25 11:41:10 2019 +0100

libtests/dl*: Use rtems_tarfs_load()

Use rtems_tarfs_load() instead of Untar_FromMemory() to reduce the
memory demands of the tests.

---

 testsuites/libtests/dl01/init.c     | 4 ++--
 testsuites/libtests/dl02/init.c     | 4 ++--
 testsuites/libtests/dl04/init.c     | 4 ++--
 testsuites/libtests/dl05/init.c     | 4 ++--
 testsuites/libtests/dl06/initimpl.h | 4 ++--
 testsuites/libtests/dl07/init.c     | 4 ++--
 testsuites/libtests/dl08/init.c     | 4 ++--
 testsuites/libtests/dl09/init.c     | 4 ++--
 testsuites/libtests/dl10/init.c     | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/testsuites/libtests/dl01/init.c b/testsuites/libtests/dl01/init.c
index d073f56..2f9c520 100644
--- a/testsuites/libtests/dl01/init.c
+++ b/testsuites/libtests/dl01/init.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -47,7 +47,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  te = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (te != 0)
   {
     printf("untar failed: %d\n", te);
diff --git a/testsuites/libtests/dl02/init.c b/testsuites/libtests/dl02/init.c
index bb2ef10..459d1b1 100644
--- a/testsuites/libtests/dl02/init.c
+++ b/testsuites/libtests/dl02/init.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -47,7 +47,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  te = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (te != 0)
   {
     printf("untar failed: %d\n", te);
diff --git a/testsuites/libtests/dl04/init.c b/testsuites/libtests/dl04/init.c
index a19c3b2..d56b235 100644
--- a/testsuites/libtests/dl04/init.c
+++ b/testsuites/libtests/dl04/init.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -47,7 +47,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  te = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (te != 0)
   {
     printf("untar failed: %d\n", te);
diff --git a/testsuites/libtests/dl05/init.c b/testsuites/libtests/dl05/init.c
index dd2150d..37dd99b 100644
--- a/testsuites/libtests/dl05/init.c
+++ b/testsuites/libtests/dl05/init.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -47,7 +47,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  te = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (te != 0)
   {
     printf("untar failed: %d\n", te);
diff --git a/testsuites/libtests/dl06/initimpl.h b/testsuites/libtests/dl06/initimpl.h
index 6f03d01..7dd8621 100644
--- a/testsuites/libtests/dl06/initimpl.h
+++ b/testsuites/libtests/dl06/initimpl.h
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -51,7 +51,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  te = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (te != 0)
   {
     printf("untar failed: %d\n", te);
diff --git a/testsuites/libtests/dl07/init.c b/testsuites/libtests/dl07/init.c
index e398b58..9d8e375 100644
--- a/testsuites/libtests/dl07/init.c
+++ b/testsuites/libtests/dl07/init.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -48,7 +48,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  te = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (te != 0)
   {
     printf("untar failed: %d\n", te);
diff --git a/testsuites/libtests/dl08/init.c b/testsuites/libtests/dl08/init.c
index d1f01a5..65291bd 100644
--- a/testsuites/libtests/dl08/init.c
+++ b/testsuites/libtests/dl08/init.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -48,7 +48,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  te = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (te != 0)
   {
     printf("untar failed: %d\n", te);
diff --git a/testsuites/libtests/dl09/init.c b/testsuites/libtests/dl09/init.c
index 5343a1d..eafb5f4 100644
--- a/testsuites/libtests/dl09/init.c
+++ b/testsuites/libtests/dl09/init.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 
 #include <rtems/rtl/rtl.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -48,7 +48,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  te = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  te = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (te != 0)
   {
     printf("untar failed: %d\n", te);
diff --git a/testsuites/libtests/dl10/init.c b/testsuites/libtests/dl10/init.c
index 214bc7e..d3a0457 100644
--- a/testsuites/libtests/dl10/init.c
+++ b/testsuites/libtests/dl10/init.c
@@ -21,7 +21,7 @@
 #include <rtems/rtl/rtl.h>
 #include <rtems/rtl/rtl-shell.h>
 #include <rtems/shell.h>
-#include <rtems/untar.h>
+#include <rtems/imfs.h>
 
 #include "dl-load.h"
 
@@ -52,7 +52,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_BEGIN();
 
-  e = Untar_FromMemory((void *)TARFILE_START, (size_t)TARFILE_SIZE);
+  e = rtems_tarfs_load("/", (void *)TARFILE_START, (size_t)TARFILE_SIZE);
   if (e != 0)
   {
     printf ("error: untar failed: %d\n", e);