Changes to enable tests - added command.c and command.h from old osc …

…osd-initiator code.

osd-target/tests/Makefile

@@ -3,15 +3,17 @@
 #
 
 DEP := .depend
-TESTS := $(wildcard *.c)
-OBJ := $(TESTS:.c=.o)
-EXE := $(TESTS:.c=)
 
 CMD := command.c
 CMD_OBJ := $(CMD:.c=.o)
-CMD_SRC := ../../osd-initiator/$(CMD)
+CMD_SRC := $(CMD)
 CMD_INC := $(CMD_SRC:.c=.h)
 
+TESTS := $(filter-out command.c, $(wildcard *.c))
+#TESTS := $(wildcard *.c)
+OBJ := $(TESTS:.c=.o)
+EXE := $(TESTS:.c=)
+
 LIBOSD := ../libosdtgt.a ../../osd-util/libosdutil.a 
 
 -include ../../Makedefs
@@ -25,6 +27,10 @@ CWARN := -Wall -W -Wpointer-arith -Wwrite-strings -Wcast-align -Wcast-qual \
 	-Wmissing-declarations -Wnested-externs
 CFLAGS := $(COPTS) $(CWARN) -I. -I.. -I../../
 
+ifeq ($(FreeBSD_Make),1)
+CFLAGS += -I../../tgt/usr/bsd -I../../tgt/usr
+endif
+
 .SUFFIXES: .c .o .i
 
 # default target
@@ -47,6 +53,6 @@ endif
 all :: $(DEP)
 $(DEP) :
 	@$(CC) $(CPP_M) $(CFLAGS) $(TESTS) $(CMD_SRC) > $(DEP) 
-	
+
 clean:
 	rm -f $(EXE) $(OBJ) $(CMD_OBJ) $(DEP) 

osd-target/tests/cdb-test.c

@@ -30,7 +30,7 @@
 #include "cdb.h"
 #include "osd-util/osd-util.h"
 #include "osd-util/osd-sense.h"
-#include "osd-initiator/command.h"
+#include "command.h"
 
 void test_partition(struct osd_device *osd);
 void test_create(struct osd_device *osd);