1 files changed, 79 insertions, 16 deletions

diff --git a/userspace/Makefile b/userspace/Makefile
index 70e93bad..56709ec4 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -18,6 +18,10 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+# TODO:
+# - Separate rule for nvgpu_unit shared library
+# - Proper header dependency checking.
+
 # Turn off suffix rules. They are deprecated.
 .SUFFIXES:
 
@@ -28,25 +32,35 @@ TWD=$(CURDIR)
 # Top level out dir.
 OUT=$(TWD)/build
 
+# Core unit test framework.
+CORE_SRC=$(TWD)/src
+CORE_OUT=$(OUT)/nvgpu_unit_core
+
 # Nvgpu driver code.
 NVGPU_SRC=$(TWD)/../drivers/gpu/nvgpu
 NVGPU_OUT=$(OUT)/libnvgpu
 
-INCLUDES=                       \
-        -I$(NVGPU_SRC)          \
-        -I$(NVGPU_SRC)/include  \
-        -I../include            \
-        -I../include/uapi
+# Unit tests themselves.
+UNIT_SRC=$(TWD)/units
+UNIT_OUT=$(OUT)/units
 
-CONFIGS=                        \
-        -D__NVGPU_POSIX__
+INCLUDES=                               \
+        -I$(NVGPU_SRC)                  \
+        -I$(NVGPU_SRC)/include          \
+        -I$(TWD)/../include             \
+        -I$(TWD)/../include/uapi        \
+        -I$(TWD)/include
+
+CONFIGS=-D__NVGPU_POSIX__
 
 # Compiler, c-flags, etc.
 
-# CC    = clang
-CC      = gcc
-CFLAGS  = -Wall -ggdb  -Werror -fPIC $(INCLUDES) $(CONFIGS)
-LIBS    = -lpthread -pthread
+# CC      = clang
+CC        = gcc
+CFLAGS    = -Wall -ggdb  -Werror -fPIC $(INCLUDES) $(CONFIGS)
+LIB_PATHS = -L$(OUT)
+LIBS      = -lpthread -pthread -lgcov -ldl
+
 
 # Source files. We expect $(OBJS) and $(HEADERS) to get filled in here.
 include Makefile.sources
@@ -55,19 +69,68 @@ include Makefile.sources
 # Linux kernel.
 include Makefile.configs
 
-all: $(OUT)/libnvgpu-drv.so
+all: $(OUT)/nvgpu_unit $(UNITS)
+
+# Convenience targets.
+.PHONY: libnvgpu core units
+libnvgpu: $(OUT)/libnvgpu-drv.so
+core: $(OUT)/nvgpu_unit
+units: $(UNITS)
+
+# Note the weird libnvgpu_unit.so file: this is a bit of a hack. It lets the
+# unit tests link back against the nvgpu_unit executable so that they can call
+# functions (like unit_info()) directly. This shared library isn't actually
+# used for anything beyond that.
+#
+# Also it really should have its own rule...
+$(OUT)/nvgpu_unit: $(OUT)/libnvgpu-drv.so $(CORE_OBJS)
+        $(CC) -shared -o $(OUT)/libnvgpu_unit.so        \
+                $(CORE_OBJS) $(LIB_PATHS) $(LIBS)
+        $(CC) --coverage                                \
+                -o $(OUT)/nvgpu_unit $(CORE_OBJS) $(LIB_PATHS) $(LIBS)
 
 $(OUT)/libnvgpu-drv.so: $(OBJS)
         $(CC) -shared -o $(OUT)/libnvgpu-drv.so $(OBJS) -lgcov
 
-# Default build target for all the object files we want to build in userspace.
+# Default build target for all the nvgpu driver object files we want to build in
+# userspace. These get bundled into libnvgpu-drv.so.
 $(NVGPU_OUT)/%.o : $(NVGPU_SRC)/%.c $(HEADERS)
         @if [ ! -d $(dir $@) ] ; then \
                 mkdir -p $(dir $@) ; \
         fi
-        $(CC) $(CFLAGS) $(configs) -c -o $@ $<
+        $(CC) --coverage $(CFLAGS) $(configs) -c -o $@ $<
+
+# Build target for unit test files. These are not part of the libnvgpu-drv.so.
+# These comprise the unit test framework.
+$(CORE_OUT)/%.o : $(CORE_SRC)/%.c $(CORE_HEADERS)
+        @if [ ! -d $(dir $@) ] ; then \
+                mkdir -p $(dir $@) ; \
+        fi
+        $(CC) --coverage $(CFLAGS) $(configs) -c -o $@ $<
+
+# Certain variables should be exported to the unit test module builds.
+export TWD INCLUDES CONFIGS UNIT_SRC UNIT_OUT
+export CC CFLAGS LIB_PATHS LIBS
 
-.PHONY: clean
+.PHONY: $(UNITS)
+$(UNITS): $(OUT)/libnvgpu-drv.so
+        @echo "Building unit module: $@"
+        @+$(MAKE) --no-print-directory -C $@
 
-clean:
+.PHONY: clean nvgpu_clean core_clean unit_clean
+
+clean: nvgpu_clean core_clean unit_clean
         rm -rf $(OUT)
+
+nvgpu_clean:
+        rm -rf $(OUT)/libnvgpu*
+
+core_clean:
+        rm -rf $(OUT)/nvgpu_unit*
+
+unit_clean:
+        @for d in $(UNITS); do                                  \
+                echo Cleaning $$d;                              \
+                $(MAKE) --no-print-directory -C $$d clean;      \
+        done
+        rm -rf $(OUT)/units