[Mobies-commit] [commit] r4227 - in UDM/trunk/tests: . testGetAdjacentObjects testOCL testUdmCint test_childrenorder test_cintstring test_cintudmpseudo test_crosslinks test_domstringdn test_generic test_generic2 test_libs test_ns test_ns2 test_refports test_simpleudmops
endre at redhat3.isis.vanderbilt.edu
endre at redhat3.isis.vanderbilt.edu
Sun Jan 5 23:41:47 CST 2014
Author: endre
Date: Sun Jan 5 23:41:47 2014
New Revision: 4227
Log:
Fixing tests and creating OS X Makefiles for tests/
Added:
UDM/trunk/tests/Makefile.OSX
UDM/trunk/tests/testGetAdjacentObjects/Makefile.OSX
UDM/trunk/tests/testOCL/Makefile.OSX
UDM/trunk/tests/testUdmCint/Makefile.OSX
UDM/trunk/tests/test_childrenorder/Makefile.OSX
UDM/trunk/tests/test_cintstring/Makefile.OSX
UDM/trunk/tests/test_cintudmpseudo/Makefile.OSX
UDM/trunk/tests/test_crosslinks/Makefile.OSX
UDM/trunk/tests/test_domstringdn/Makefile.OSX
UDM/trunk/tests/test_generic/Makefile.OSX
UDM/trunk/tests/test_generic2/Makefile.OSX
UDM/trunk/tests/test_libs/Makefile.OSX
UDM/trunk/tests/test_ns/Makefile.OSX
UDM/trunk/tests/test_ns2/Makefile.OSX
UDM/trunk/tests/test_refports/Makefile.OSX
UDM/trunk/tests/test_simpleudmops/Makefile.OSX
Modified:
UDM/trunk/tests/test_ns2/main.cpp
Added: UDM/trunk/tests/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,25 @@
+#SUBDIRS =test_UdmPython
+SUBDIRS =test_generic test_generic2 test_libs test_simpleudmops testGetAdjacentObjects testOCL test_childrenorder testUdmCint test_cintstring test_crosslinks test_ns test_ns2 test_refports test_domstringdn
+
+
+all:
+ @for dir in $(SUBDIRS);\
+ do \
+ echo "\nInvoking make in subdir: " $${dir};\
+ $(MAKE) -C $${dir} $@ -f Makefile.OSX || exit $$?;\
+ done
+test:
+ @for dir in $(SUBDIRS);\
+ do \
+ echo "\nInvoking make clean in subdir: " $${dir};\
+ $(MAKE) test -C $${dir} $@ -f Makefile.OSX || exit $$?;\
+ done
+
+clean:
+ @for dir in $(SUBDIRS);\
+ do \
+ echo "\nInvoking make clean in subdir: " $${dir};\
+ $(MAKE) clean -C $${dir} $@ -f Makefile.OSX ;\
+ done
+
+
Added: UDM/trunk/tests/testGetAdjacentObjects/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/testGetAdjacentObjects/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,26 @@
+include ../../Makefile.OSX.incl
+
+BUILT_SOURCES_A=PackageA.cpp PackageB.cpp testAssociationScenarios.cpp
+BUILT_SOURCES_B=LampDiagram.cpp
+BUILT_SOURCES=$(BUILT_SOURCES_A) $(BUILT_SOURCES_B)
+CLEANFILES=$(BUILT_SOURCES) PackageA.h PackageA.xsd PackageB.h PackageB.xsd testAssociationScenarios.h testAssociationScenarios.xsd LampDiagram.h LampDiagram.xsd
+SOURCES=$(BUILT_SOURCES) main.cpp TestGetAdjacentObjects.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) testGetAdjacentObjects
+
+$(BUILT_SOURCES_B):../../samples/LampDiagram_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+$(BUILT_SOURCES_A):testAssociationScenarios_udm.udm ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+testGetAdjacentObjects: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o testGetAdjacentObjects -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:testGetAdjacentObjects
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./testGetAdjacentObjects
+
+clean:
+ rm -f *.o testGetAdjacentObjects $(CLEANFILES) testmodel.udm
Added: UDM/trunk/tests/testOCL/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/testOCL/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,23 @@
+include ../../Makefile.OSX.incl
+
+BUILT_SOURCES=SBML2.cpp
+CLEANFILES=$(BUILT_SOURCES) SBML2.h SBML2.dtd SBML2.xsd SBML2_xsd.h SBML2_sbml_xsd.h SBML2_math_xsd.h SBML2_math.dtd SBML2_math.xsd SBML2_sbml.dtd SBML2_sbml.xsd
+SOURCES=$(BUILT_SOURCES) main.cpp Test.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) testOcl
+
+$(BUILT_SOURCES):SBML2_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -t -T -v -g -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2
+
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+testOcl: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o testOcl -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:testOcl
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./testOcl
+
+clean:
+ rm -f *.o testOcl $(CLEANFILES) testmodel.udm test_out.xml
Added: UDM/trunk/tests/testUdmCint/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/testUdmCint/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,36 @@
+include ../../Makefile.OSX.incl
+
+BUILT_SOURCES_A=GeneTF.cpp
+BUILT_SOURCES_B=SBML2Ex.cpp
+BUILT_SOURCES=$(BUILT_SOURCES_A) $(BUILT_SOURCES_B)
+CLEANFILES=$(BUILT_SOURCES) SBML2Ex.h SBML2Ex_xsd.h SBML2Ex_bc_xsd.h SBML2Ex_dbi_xsd.h SBML2Ex_flux_xsd.h SBML2Ex_jd_xsd.h SBML2Ex_jigcell_xsd.h SBML2Ex_math_xsd.h SBML2Ex_sbml_xsd.h SBML2Ex_unigene_xsd.h SBML2Ex_xhtml_xsd.h SBML2Ex_bc.xsd SBML2Ex_dbi.xsd SBML2Ex_flux.xsd SBML2Ex_jd.xsd SBML2Ex_jigcell.xsd SBML2Ex_math.xsd SBML2Ex_sbml.xsd SBML2Ex_unigene.xsd SBML2Ex_xhtml.xsd SBML2Ex.xsd
+
+SOURCES=$(BUILT_SOURCES) main.cpp testReadSBML2Ex.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) testUdmCint
+
+$(BUILT_SOURCES_B):SBML2Ex_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -g -v -e -T -q jigcell -i xhtml \
+ -u math=http://www.w3.org/1998/Math/MathML \
+ -u sbml=http://www.sbml.org/sbml/level2 \
+ -u dbi=http://www.dbi.tju.edu/xmlns/dbi \
+ -u unigene=http://www.dbi.tju.edu/xmlns/unigene \
+ -u xhtml=http://www.w3.org/1999/xhtml \
+ -u jigcell=http://mpf.biol.vt.edu/ns \
+ -u bc=http://www.sbml.org/2001/ns/biocharon \
+ -u flux=http://arep.med.harvard.edu/fluxns
+
+$(BUILT_SOURCES_A):GeneTF_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T -t -v -g -u GeneTF=http://kutykuruty.khm.edu
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+testUdmCint: $(OBJECTS)
+ $(CC) $(BCFLAGS) main.o testReadSBML2Ex.o -o testUdmCint -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:testUdmCint
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./testUdmCint
+
+clean:
+ rm -f *.o testUdmCint $(CLEANFILES)
Added: UDM/trunk/tests/test_childrenorder/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_childrenorder/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,20 @@
+include ../../Makefile.OSX.incl
+
+SOURCES=childrenorderTest.cpp test_childrenorder.cpp LampDiagram.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_childrenorder
+
+LampDiagram.cpp:../../samples/LampDiagram_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_childrenorder: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_childrenorder -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_childrenorder
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_childrenorder
+
+clean:
+ rm -f *.o test_childrenorder LampDiagram.cpp LampDiagram.h LampDiagram.xsd *.mem *.xml
Added: UDM/trunk/tests/test_cintstring/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_cintstring/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,18 @@
+include ../../Makefile.OSX.incl
+
+SOURCES=cintstringTest.cpp test_cintstring.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_cintstring
+
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_cintstring: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_cintstring -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_cintstring
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_cintstring
+
+clean:
+ rm -f *.o test_cintstring
Added: UDM/trunk/tests/test_cintudmpseudo/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_cintudmpseudo/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,20 @@
+include ../../Makefile.OSX.incl
+
+SOURCES=cintUdmPseudoTest.cpp test_cintudmpseudo.cpp LampDiagram.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_cintpseudo
+
+LampDiagram.cpp:../../samples/LampDiagram_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_cintpseudo: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_cintpseudo -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_cintpseudo
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_cintpseudo
+
+clean:
+ rm -f *.o test_cintpseudo LampDiagram.cpp LampDiagram.h LampDiagram.xsd *.mem *.xml
Added: UDM/trunk/tests/test_crosslinks/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_crosslinks/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,22 @@
+include ../../Makefile.OSX.incl
+
+BUILT_SOURCES=CL.cpp CLPackage.cpp Package1.cpp Package2.cpp
+SOURCES=$(BUILT_SOURCES) CrossLinkTester.cpp test_CrossLinks.cpp
+CLEAN_FILES=$(BUILT_SOURCES) CLPackage.h CLPackage.xsd Package1.cpp Package1.h Package1.xsd Package2.cpp Package2.h Package2.xsd CL.h CL.xsd Package2_NSp.xsd Package2_NSp_NSc.xsd
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_crosslinks
+
+$(BUILT_SOURCES):CL_udm.udm ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_crosslinks: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_crosslinks -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_crosslinks
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_crosslinks
+
+clean:
+ rm -f *.o test_crosslinks $(CLEAN_FILES)
Added: UDM/trunk/tests/test_domstringdn/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_domstringdn/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,20 @@
+include ../../Makefile.OSX.incl
+
+SOURCES=test_domstringdn.cpp domstringdnTest.cpp LampDiagram.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_domstringdn
+
+LampDiagram.cpp:../../samples/LampDiagram_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_domstringdn: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_domstringdn -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_domstringdn
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_domstringdn
+
+clean:
+ rm -f *.o test_domstringdn LampDiagram.cpp LampDiagram.h LampDiagram.xsd *.mem *.xml
Added: UDM/trunk/tests/test_generic/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_generic/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,20 @@
+include ../../Makefile.OSX.incl
+
+SOURCES=genericTest.cpp test_generic.cpp LampDiagram.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_generic
+
+LampDiagram.cpp:../../samples/LampDiagram_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_generic: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_generic -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_generic
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_generic
+
+clean:
+ rm -f *.o test_generic LampDiagram.cpp LampDiagram.h LampDiagram.xsd *.mem *.xml
Added: UDM/trunk/tests/test_generic2/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_generic2/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,20 @@
+include ../../Makefile.OSX.incl
+
+SOURCES=genericTest.cpp test_generic.cpp LampDiagram.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_generic
+
+LampDiagram.cpp:../../samples/LampDiagram_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T --leesa
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_generic: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_generic -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_generic
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_generic
+
+clean:
+ rm -f *.o test_generic LampDiagram.cpp LampDiagram.h LampDiagram.xsd *.mem *.xml
Added: UDM/trunk/tests/test_libs/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_libs/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,20 @@
+include ../../Makefile.OSX.incl
+
+SOURCES=main.cpp LibsTest.cpp LampDiagram.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) LibsTest
+
+LampDiagram.cpp:../../samples/LampDiagram_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T --leesa
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+LibsTest: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o LibsTest -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:LibsTest
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./LibsTest
+
+clean:
+ rm -f *.o LibsTest LampDiagram.cpp LampDiagram.h LampDiagram.xsd *.mem *.xml
Added: UDM/trunk/tests/test_ns/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_ns/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,22 @@
+include ../../Makefile.OSX.incl
+
+BUILT_SOURCES=test_ns.cpp
+SOURCES=$(BUILT_SOURCES) test_ns_test.cpp main.cpp
+CLEAN_FILES=$(BUILT_SOURCES) test_ns.h test_ns.xsd test_ns_A.xsd test_ns_B.xsd test_ns_AB.xsd
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_ns
+
+$(BUILT_SOURCES):test_ns_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_ns: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_ns -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_ns
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_ns
+
+clean:
+ rm -f *.o test_ns $(CLEAN_FILES)
Added: UDM/trunk/tests/test_ns2/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_ns2/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,22 @@
+include ../../Makefile.OSX.incl
+
+BUILT_SOURCES=CHost.cpp
+SOURCES=$(BUILT_SOURCES) main.cpp
+CLEAN_FILES=$(BUILT_SOURCES) CHost.xsd CHost_A.xsd CHost_B.xsd CHost_C.xsd CHost.h test1.mem test1.xml
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_ns2
+
+$(BUILT_SOURCES):CHost_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_ns2: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_ns2 -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_ns2
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_ns2
+
+clean:
+ rm -f *.o test_ns2 $(CLEAN_FILES)
Modified: UDM/trunk/tests/test_ns2/main.cpp
==============================================================================
--- UDM/trunk/tests/test_ns2/main.cpp Sun Jan 5 23:41:25 2014 (r4226)
+++ UDM/trunk/tests/test_ns2/main.cpp Sun Jan 5 23:41:47 2014 (r4227)
@@ -47,17 +47,29 @@
int main()
{
try
- {
- std::string fn = "test1.mga";
+ {
+ std::string fn;
+#ifdef _WIN32
+ fn = "test1.mga";
+ writeTest(fn);
+ readTest(fn);
+#endif
+ fn = "test1.mem";
writeTest(fn);
readTest(fn);
+
+ fn = "test1.xml";
+ writeTest(fn);
+ readTest(fn);
+
+
}
catch(udm_exception& e)
{
std::cout << e.what();
return 1;
}
-
+ cout << "OK!" << endl;
return 0;
}
Added: UDM/trunk/tests/test_refports/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_refports/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,22 @@
+include ../../Makefile.OSX.incl
+
+BUILT_SOURCES=RefPort.cpp
+SOURCES=$(BUILT_SOURCES) RefPortsTest.cpp main.cpp
+CLEAN_FILES=$(BUILT_SOURCES) RefPort.xsd RefPort.h
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) test_refports
+
+$(BUILT_SOURCES):RefPort_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+test_refports: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o test_refports -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:test_refports
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./test_refports
+
+clean:
+ rm -f *.o test_refports $(CLEAN_FILES)
Added: UDM/trunk/tests/test_simpleudmops/Makefile.OSX
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/tests/test_simpleudmops/Makefile.OSX Sun Jan 5 23:41:47 2014 (r4227)
@@ -0,0 +1,20 @@
+include ../../Makefile.OSX.incl
+
+SOURCES=UDMTest.cpp LampTest.cpp LampDiagram.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+
+all: $(SOURCES) $(OBJECTS) UdmTest
+
+LampDiagram.cpp:../../samples/LampDiagram_udm.xml ../../bin/Udm
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ../../bin/Udm $< -v -d ../../etc -T --leesa
+.cpp.o:
+ $(CC) $(CFLAGS) $(INCLUDE) -I $(CPPUNIT)/include $< -o $@
+
+UdmTest: $(OBJECTS)
+ $(CC) $(BCFLAGS) $(OBJECTS) -o UdmTest -lUdm -L../../lib -lcppunit -L $(CPPUNITLIBS)
+
+test:UdmTest
+ DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) ./UdmTest
+
+clean:
+ rm -f *.o UdmTest LampDiagram.cpp LampDiagram.h LampDiagram.xsd *.mem *.xml
More information about the Mobies-commit
mailing list