Moved mmrpc_test.c to common directory, it's used by both Linux and QNX.

In order to minimize duplicate code, I moved the mmrpc_test.c source
file from a Linux folder to a common location in packages/ti/ipc/tests.
The Linux and QNX makefiles live in their respective linux and qnx
folders.

diff --git a/linux/src/tests/Makefile.am b/linux/src/tests/Makefile.am
index 00c0c88fda923b2d54801cac29f0b7e4475d9196..d24dbd596fabca8e0d83f2928c47cb377f19f0c2 100644 (file)
--- a/linux/src/tests/Makefile.am
+++ b/linux/src/tests/Makefile.am
@@ -34,6 +34,7 @@
 # additional include paths necessary to compile the program
 AM_CFLAGS = -I$(top_srcdir)/linux/include -I$(top_srcdir)/packages  \
         -I$(CMEM_INSTALL_DIR)/packages -D_GNU_SOURCE -Wall @AM_CFLAGS@
+VPATH = ../../../packages/ti/ipc/tests
 
 ###############################################################################
 # THE PROGRAMS TO BUILD

diff --git a/linux/src/tests/mmrpc_test.c b/packages/ti/ipc/tests/mmrpc_test.c
similarity index 100%
rename from linux/src/tests/mmrpc_test.c
rename to packages/ti/ipc/tests/mmrpc_test.c

diff --git a/packages/ti/ipc/tests/package.bld b/packages/ti/ipc/tests/package.bld
index 221550a2665b81589d9f9d738c7aef979018dae0..f70b9b983dc0a7bce25f984f2d9a8a8d81a10d99 100644 (file)
--- a/packages/ti/ipc/tests/package.bld
+++ b/packages/ti/ipc/tests/package.bld
@@ -37,6 +37,8 @@
 var Build = xdc.useModule('xdc.bld.BuildEnvironment');
 var Pkg = xdc.useModule('xdc.bld.PackageContents');
 
+Pkg.otherFiles = [ "mmrpc_test.c" ];
+
 /* when constructing a release, release everything */
 Pkg.attrs.exportAll = true;
 

diff --git a/qnx/src/tests/mmrpc_test/common.mk b/qnx/src/tests/mmrpc_test/common.mk
index dd67b19722141b29900606b2641232288b3160e6..007b57e9736900acfa790fd1c74d03ecba485f51 100644 (file)
--- a/qnx/src/tests/mmrpc_test/common.mk
+++ b/qnx/src/tests/mmrpc_test/common.mk
@@ -47,7 +47,7 @@ INSTALLDIR = /dev/null
 CCOPTS += -DSYSLINK_BUILDOS_QNX
 
 # source path
-EXTRA_SRCVPATH = $(IPC_REPO)/linux/src/tests
+EXTRA_SRCVPATH = $(IPC_REPO)/packages/ti/ipc/tests
 SRCS = mmrpc_test.c
 
 EXCLUDE_OBJS =