sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Add loading of ET_DYN shared object test to sotest"

Browse Source 
This reverts commit 72eaed8fdd.
This commit is contained in:
Tiago Medicci Serrano 2024-05-30 14:04:01 -03:00 committed by Alan Carvalho de Assis
parent 72eaed8fdd
commit 3086dcbcf0
5 changed files with 2 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/sotest/lib/Makefile
View File

@ -24,8 +24,8 @@ ALL_SUBDIRS = sotest
BUILD_SUBDIRS = sotest
ifneq ($(CONFIG_MODLIB_MAXDEPEND),0)
ALL_SUBDIRS += modprint dynload
BUILD_SUBDIRS += modprint dynload
ALL_SUBDIRS += modprint
BUILD_SUBDIRS += modprint
endif
SOTEST_DIR = $(APPDIR)/examples/sotest

1
examples/sotest/lib/dynload/.gitignore vendored
View File

@ -1 +0,0 @@
/dynload

55
examples/sotest/lib/dynload/Makefile
View File

@ -1,55 +0,0 @@
############################################################################
# apps/examples/sotest/lib/dynload/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################
include $(APPDIR)/Make.defs
ifeq ($(CONFIG_EXAMPLES_SOTEST_LIBC),y)
LDLIBPATH += -L $(NUTTXLIB)
endif
ifeq ($(CONFIG_EXAMPLES_SOTEST_LIBC),y)
LDLIBS += -lc
endif
BIN = dynload
SRCS = $(BIN).c
OBJS = $(SRCS:.c=$(OBJEXT))
all: $(BIN)
.PHONY: all clean install
$(OBJS): %$(OBJEXT): %.c
@echo "MODULECC: $<"
$(Q) $(MODULECC) -c $(CMODULEFLAGS) $(SHCCFLAGS) $< -o $@
$(BIN): $(OBJS)
@echo "MODULELD: $<"
$(Q) $(MODULELD) $(SHMODULEFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
$(FSROOT_DIR)/$(BIN): $(BIN)
$(Q) mkdir -p $(FSROOT_DIR)
$(Q) install $(BIN) $(FSROOT_DIR)/$(BIN)
install: $(FSROOT_DIR)/$(BIN)
clean:
$(call DELFILE, $(BIN))
$(call CLEAN)

51
examples/sotest/lib/dynload/dynload.c
View File

@ -1,51 +0,0 @@
/****************************************************************************
* apps/examples/sotest/lib/dynload/dynload.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <sys/types.h>
#include <stdarg.h>
#include <stdio.h>
#include <nuttx/symtab.h>
#include <nuttx/lib/modlib.h>
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
int dynload(int);
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: dynload
****************************************************************************/
int dynload(int a)
{
return a + 10;
}

34
examples/sotest/sotest_main.c
View File

@ -105,7 +105,6 @@ int main(int argc, FAR char *argv[])
char devname[32];
#if CONFIG_MODLIB_MAXDEPEND > 0
FAR void *handle1;
FAR void *handle3;
#endif
FAR void *handle2;
CODE void (*testfunc)(FAR const char *msg);
@ -171,32 +170,6 @@ int main(int argc, FAR char *argv[])
fprintf(stderr, "ERROR: dlopen(/modprint) failed\n");
exit(EXIT_FAILURE);
}
handle3 = dlopen(BINDIR "/dynload", RTLD_NOW | RTLD_LOCAL);
if (handle3 == NULL)
{
fprintf(stderr, "ERROR: dlopen(/dynload) failed - %s\n",
strerror(errno));
exit(EXIT_FAILURE);
}
else
{
int (*dynload)(int);
dynload = dlsym(handle3, "dynload");
if (dynload != NULL)
{
int a = dynload(32);
printf("dynload returned %d which is the %s answer\n",
a, (a == 42 ? "correct" : "incorrect"));
}
else
{
fprintf(stderr, "ERROR: dlsym(dynload) failed - %s\n",
strerror(errno));
exit(EXIT_FAILURE);
}
}
#endif
/* Install the second test shared library */
@ -300,13 +273,6 @@ int main(int argc, FAR char *argv[])
fprintf(stderr, "ERROR: dlclose(handle1) failed: %d\n", ret);
exit(EXIT_FAILURE);
}
ret = dlclose(handle3);
if (ret < 0)
{
fprintf(stderr, "ERROR: dlclose(handle3) failed: %d\n", ret);
exit(EXIT_FAILURE);
}
#endif
#ifdef CONFIG_EXAMPLES_SOTEST_BUILTINFS