summaryrefslogtreecommitdiffstats
path: root/testsuites/psxtests/psxchroot01
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-08-09 14:29:33 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-08-09 14:29:33 +0000
commit38cc1e1b214a5daf599ef4fd61908b40cdf1d84a (patch)
tree874320d7ea74ebbd8890e02ef8d6f560c88d79e5 /testsuites/psxtests/psxchroot01
parent2010-08-09 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff)
downloadrtems-38cc1e1b214a5daf599ef4fd61908b40cdf1d84a.tar.bz2
2010-08-09 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1661/testing * psxchroot01/test.c, psximfs01/init.c, psximfs02/init.c, psxpipe01/init.c: Eliminate most references to RTEMS_Malloc_Heap.
Diffstat (limited to 'testsuites/psxtests/psxchroot01')
-rw-r--r--testsuites/psxtests/psxchroot01/test.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/testsuites/psxtests/psxchroot01/test.c b/testsuites/psxtests/psxchroot01/test.c
index 25105567fa..ff872bb1e3 100644
--- a/testsuites/psxtests/psxchroot01/test.c
+++ b/testsuites/psxtests/psxchroot01/test.c
@@ -34,7 +34,7 @@
#include <rtems/libio.h>
#include <rtems/userenv.h>
#include <pmacros.h>
-#include <rtems/score/heap.h>
+#include <rtems/libcsupport.h>
void touch( char *file )
{
@@ -64,8 +64,6 @@ int fileexists( char *file )
}
#if defined(__rtems__)
-extern Heap_Control *RTEMS_Malloc_Heap;
-
int test_main(void)
#else
int main(
@@ -76,7 +74,6 @@ int main(
{
int status;
void *alloc_ptr = (void *)0;
- Heap_Information_block Info;
/*
* This test is the C equivalent of this sequence.
#mkdir /one
@@ -108,8 +105,7 @@ int main(
touch( "/one/two/two.test" );
puts( "allocate most of memory - attempt to fail chroot - expect ENOTSUP" );
- _Heap_Get_information(RTEMS_Malloc_Heap, &Info);
- alloc_ptr = malloc( Info.Free.largest - 4 );
+ alloc_ptr = malloc( malloc_free_space() - 4 );
rtems_test_assert( alloc_ptr != NULL );
status = chroot( "/one" );