[ros-diffs] [chorns] 14309: Enable rbuild_test again

Enable rbuild_test again
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp
  _____  

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
--- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
2005-03-25 12:00:56 UTC (rev 14308)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak
2005-03-25 13:02:35 UTC (rev 14309)
@@ -52,6 +52,23 @@

 endif
 
 
+RBUILD_TESTS_BASE = $(RBUILD_BASE_)tests
+RBUILD_TESTS_BASE_ = $(RBUILD_TESTS_BASE)$(SEP)
+RBUILD_TESTS_INT = $(INTERMEDIATE_)$(RBUILD_TESTS_BASE)
+RBUILD_TESTS_INT_ = $(RBUILD_TESTS_INT)$(SEP)
+RBUILD_TESTS_OUT = $(OUTPUT)$(RBUILD_TESTS_BASE)
+
+$(RBUILD_TESTS_INT): $(RBUILD_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RBUILD_TESTS_OUT): $(RBUILD_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
+
 RBUILD_DEVCPP_BASE = $(RBUILD_BACKEND_BASE_)devcpp
 RBUILD_DEVCPP_BASE_ = $(RBUILD_DEVCPP_BASE)$(SEP)
 RBUILD_DEVCPP_INT = $(INTERMEDIATE_)$(RBUILD_DEVCPP_BASE)
@@ -236,24 +253,59 @@
 	$(ECHO_CC)
 	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
-#$(RBUILD_COMMON_OBJECTS): %.o: %.cpp $(RBUILD_INT)
-#	$(ECHO_CC)
-#	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_OUT)
+	$(ECHO_LD)
+	${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@
 
-#$(RBUILD_SPECIAL_OBJECTS): %.o: %.cpp $(RBUILD_INT)
-#	$(ECHO_CC)
-#	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+$(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
-#$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_OUT)
-#	$(ECHO_LD)
-#	${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@
+$(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
-#$(RBUILD_TEST_SPECIAL_OBJECTS): %.o: %.cpp $(RBUILD_INT)
-#	$(ECHO_CC)
-#	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+$(RBUILD_TESTS_INT_)functiontest.o:
$(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
+$(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
+$(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
+$(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)linkerflagtest.o:
$(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)sourcefiletest.o:
$(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp
$(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+
 .PHONY: rbuild_test
 
 rbuild_test: $(RBUILD_TEST_TARGET)
  _____  

Modified:
branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp
2005-03-25 12:00:56 UTC (rev 14308)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp
2005-03-25 13:02:35 UTC (rev 14309)
@@ -5,5 +5,5 @@

 void FunctionTest::Run ()
 {
 	string fixedupFilename = FixupTargetFilename ( "." SSEP "dir1"
SSEP "dir2" SSEP ".." SSEP "filename.txt" );
-	ARE_EQUAL ( "$(INTERMEDIATE)dir1" SSEP "filename.txt",
fixedupFilename );
+	ARE_EQUAL ( "dir1" SSEP "filename.txt", fixedupFilename );
 }