Sonar inclusion/exclusion in the LF environment seems problematic
at best. This change moves the Listener source into a subdir (src)
in hopes that exclusion of the test code from analysis and coverage
reporting can be more easily managed.
Issue-ID: RIC-632
Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I87f5819de876c68eb3619d9e9ebaa7aeeef49b23
19 files changed:
RUN dpkg -i rmr_${RMR_VER}_amd64.deb
RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
RUN dpkg -i rmr_${RMR_VER}_amd64.deb
RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
-RUN mkdir /playpen/bin /playpen/listener /playpen/listener/test
-ARG SRC=.
-COPY ${SRC}/*.ksh ${SRC}/Makefile ${SRC}/*.h ${SRC}/*.c /playpen/listener/
-COPY ${SRC}/verify_replay.sh ${SRC}/verify.sh /playpen/listener/
+RUN mkdir -p /playpen/bin /playpen/listener/src /playpen/listener/test
+ARG SRC=src
+COPY ${SRC}/*.ksh ${SRC}/Makefile ${SRC}/*.h ${SRC}/*.c /playpen/listener/src/
+COPY ${SRC}/verify_replay.sh ${SRC}/verify.sh /playpen/listener/src/
COPY ${TEST}/*.ksh ${TEST}/Makefile ${TEST}/*.h ${TEST}/*.c /playpen/listener/test/
# Build all binaries; verify scripts expect them to be in bin, so we must copy too
#
ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib
ENV C_INCLUDE_PATH=/usr/local/include
COPY ${TEST}/*.ksh ${TEST}/Makefile ${TEST}/*.h ${TEST}/*.c /playpen/listener/test/
# Build all binaries; verify scripts expect them to be in bin, so we must copy too
#
ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib
ENV C_INCLUDE_PATH=/usr/local/include
-RUN cd /playpen/listener \
+RUN cd /playpen/listener/src \
&& make -B all \
&& ls -al mc_listener \
&& cp mc_listener sender pipe_reader rdc_replay rdc_extract /playpen/bin/
&& make -B all \
&& ls -al mc_listener \
&& cp mc_listener sender pipe_reader rdc_replay rdc_extract /playpen/bin/
# Run unit tests. If they don't pass the build fails here. Tests can be run from src, but expect binaries in bin
# so that they can be run in the final image as well.
#
# Run unit tests. If they don't pass the build fails here. Tests can be run from src, but expect binaries in bin
# so that they can be run in the final image as well.
#
-ENV PATH /playpen/bin:/playpen/listener:$PATH
-RUN cd /playpen/listener/test/; ./run_unit_test.ksh
-RUN cd /playpen/listener/; /playpen/listener/verify.sh; /playpen/listener/verify_replay.sh
+ENV PATH /playpen/bin:/playpen/listener/src:$PATH
+RUN cd /playpen/listener/test \
+ && ./run_unit_test.ksh
+
+RUN cd /playpen/listener/src \
+ && /playpen/listener/src/verify.sh \
+ && /playpen/listener/src/verify_replay.sh
# ----- final, smaller image ----------------------------------
# ----- final, smaller image ----------------------------------
COPY --from=buildenv /playpen/rmr_*.deb /tmp/
RUN dpkg -i /tmp/rmr_*_amd64.deb
COPY --from=buildenv /playpen/rmr_*.deb /tmp/
RUN dpkg -i /tmp/rmr_*_amd64.deb
-# obtusely this uses the previous value
-ARG SRC
+ARG SRC=src
+ARG PPSRC=/playpen/listener/src
RUN mkdir -p /playpen/bin
RUN mkdir -p /playpen/bin
+
+# pull from the huge builder image
COPY --from=buildenv /usr/local/lib/* /usr/local/lib/
COPY --from=buildenv /usr/local/lib/* /usr/local/lib/
-COPY --from=buildenv /playpen/listener/mc_listener /playpen/listener/sender /playpen/listener/pipe_reader /playpen/listener/rdc_replay /playpen/listener/rdc_extract /playpen/bin/
-COPY ${SRC}/verify_replay.sh ${SRC}/verify.sh ${SRC}/run_replay.sh ${SRC}/help /playpen/bin/
+COPY --from=buildenv ${PPSRC}/mc_listener ${PPSRC}/sender ${PPSRC}/pipe_reader ${PPSRC}/rdc_replay ${PPSRC}/rdc_extract /playpen/bin/
+
+# pull from the source
+COPY ${SRC}/verify_replay.sh ${SRC}/verify.sh ${SRC}/run_replay.sh /playpen/bin/
+COPY ${SRC}/help.sh /playpen/bin/help
+
+RUN chmod 755 /playpen/bin/*
ENV PATH=/playpen/bin:$PATH
ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib
ENV PATH=/playpen/bin:$PATH
ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib
-unit_test: unit_test.c ../mcl.c ../rdc.c
+unit_test: unit_test.c ../src/mcl.c ../src/rdc.c
gcc -g $(coverage_opts) unit_test.c -o unit_test -lrmr_si -lm -lpthread
# ---- housekeeping stuff -------------------------------------------------------------
gcc -g $(coverage_opts) unit_test.c -o unit_test -lrmr_si -lm -lpthread
# ---- housekeeping stuff -------------------------------------------------------------
-cp *.gcov ../ # the CI job defines the listener dir as the spot to find these, so put them there
-
rm -f /tmp/PID$$.*
exit $rc
rm -f /tmp/PID$$.*
exit $rc
#include "test_rmr_em.c" // emulated rmr functions (for receives)
// this/these are what we are testing; include them directly (must be after forever def)
#include "test_rmr_em.c" // emulated rmr functions (for receives)
// this/these are what we are testing; include them directly (must be after forever def)
-#include "../mcl.c"
-#include "../rdc.c"
+#include "../src/mcl.c"
+#include "../src/rdc.c"
/*
Set up env things for the rdc setup call.
/*
Set up env things for the rdc setup call.