Changeset 696b9121 in rtems


Ignore:
Timestamp:
Apr 12, 2018, 7:48:28 AM (15 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
f35c3be9
Parents:
f59d435d
git-author:
Chris Johns <chrisj@…> (04/12/18 07:48:28)
git-committer:
Chris Johns <chrisj@…> (04/12/18 07:59:46)
Message:

libdl: Fix the tests loading the correct files

Location:
testsuites/libtests
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • testsuites/libtests/Makefile.am

    rf59d435d r696b9121  
    365365dl02.tar: dl02-o1.o dl02-o2.o
    366366        @rm -f $@
    367         $(AM_V_GEN)$(PAX) -w -f $@ $<
     367        $(AM_V_GEN)$(PAX) -w -f $@ $+
    368368dl02-tar.c: dl02.tar
    369369        $(AM_V_GEN)$(BIN2C) -C $< $@
  • testsuites/libtests/dl01/dl-load.c

    rf59d435d r696b9121  
    2929  char*  message = "loaded";
    3030
    31   printf("load: /dl-o1.o\n");
     31  printf("load: /dl01-o1.o\n");
    3232
    33   handle = dlopen ("/dl-o1.o", RTLD_NOW | RTLD_GLOBAL);
     33  handle = dlopen ("/dl01-o1.o", RTLD_NOW | RTLD_GLOBAL);
    3434  if (!handle)
    3535  {
  • testsuites/libtests/dl02/dl-load.c

    rf59d435d r696b9121  
    5050  int    ret;
    5151
    52   o1 = dl_load_obj("/dl-o1.o");
     52  o1 = dl_load_obj("/dl02-o1.o");
    5353  if (!o1)
    5454    return 1;
    55   o2 = dl_load_obj("/dl-o2.o");
     55  o2 = dl_load_obj("/dl02-o2.o");
    5656  if (!o1)
    5757    return 1;
  • testsuites/libtests/dl03/dl-cache.c

    rf59d435d r696b9121  
    11/*
    2  * Copyright (c) 2016 Chris Johns <chrisj@rtems.org>.  All rights reserved.
     2 * Copyright (c) 2016, 2018 Chris Johns <chrisj@rtems.org>.  All rights reserved.
    33 *
    44 * The license and distribution terms for this file may be
     
    6464}
    6565
    66 static off_t dl_cache_buffer_offset(rtems_rtl_obj_cache_t* cache, void* buffer)
     66static off_t dl_cache_buffer_offset(rtems_rtl_obj_cache* cache, void* buffer)
    6767{
    6868  return (off_t) (((uint8_t*) buffer) - ((uint8_t*) cache->buffer));
     
    7474   * Check the RTL object is created and can be locked and unlocked.
    7575   */
    76   rtems_test_assert(rtems_rtl_data () == NULL);
     76  rtems_test_assert(rtems_rtl_data_unprotected () == NULL);
    7777  rtems_test_assert(rtems_rtl_lock () != NULL);
    7878  rtems_rtl_unlock ();
    79   rtems_test_assert(rtems_rtl_data () != NULL);
     79  rtems_test_assert(rtems_rtl_data_unprotected () != NULL);
    8080  rtems_rtl_trace_set_mask(RTEMS_RTL_TRACE_ALL | RTEMS_RTL_TRACE_CACHE);
    8181}
     
    8383int dl_cache_test(void)
    8484{
    85   rtems_rtl_obj_cache_t cache;
    86   int                   fd;
    87   void*                 buffer;
    88   off_t                 offset_in;
    89   off_t                 offset;
    90   size_t                length_in;
    91   size_t                length;
     85  rtems_rtl_obj_cache cache;
     86  int                 fd;
     87  void*               buffer;
     88  off_t               offset_in;
     89  off_t               offset;
     90  size_t              length_in;
     91  size_t              length;
    9292
    9393  /*
  • testsuites/libtests/dl04/dl-load.c

    rf59d435d r696b9121  
    2727
    2828  rtems_rtl_trace_set_mask(RTEMS_RTL_TRACE_ALL);
    29   handle = dlopen("/dl-o4.o", RTLD_GLOBAL | RTLD_NOW);
     29  handle = dlopen("/dl04-o4.o", RTLD_GLOBAL | RTLD_NOW);
    3030  err = dlerror();
    3131  if (err != NULL)
  • testsuites/libtests/dl05/dl-load.c

    rf59d435d r696b9121  
    3737  rtems_rtl_trace_set_mask(RTEMS_RTL_TRACE_ALL);
    3838
    39   handle = dlopen("/dl-o5.o", RTLD_GLOBAL | RTLD_NOW);
     39  handle = dlopen("/dl05-o5.o", RTLD_GLOBAL | RTLD_NOW);
    4040  if (handle == NULL)
    4141  {
Note: See TracChangeset for help on using the changeset viewer.