From 0125984e83dcd71b85a53916c2b71d2e6a0f00c0 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Mon, 14 Nov 2005 14:36:45 +0000
Subject: [PATCH] Unbreak generators_test: - rename UI type to TUI to avoid
 conflicts with Qt - adjust to print.text changes

[SVN r31645]
---
 v2/test/generators-test/Jamfile          |  2 +-
 v2/test/generators-test/{c.ui => c.tui}  |  0
 v2/test/generators-test/lex.jam          |  3 ++-
 v2/test/generators-test/project-root.jam | 10 +++++-----
 4 files changed, 8 insertions(+), 7 deletions(-)
 rename v2/test/generators-test/{c.ui => c.tui} (100%)

diff --git a/v2/test/generators-test/Jamfile b/v2/test/generators-test/Jamfile
index 0e79b65cb..8091b2264 100644
--- a/v2/test/generators-test/Jamfile
+++ b/v2/test/generators-test/Jamfile
@@ -5,7 +5,7 @@ project
     : requirements <define>YY_NO_UNPUT
     ;
 
-exe a : a.cpp b.cxx obj_1 obj_2 c.ui d.wd x.l y.x_pro lib//auxilliary ;
+exe a : a.cpp b.cxx obj_1 obj_2 c.tui d.wd x.l y.x_pro lib//auxilliary ;
 # This should not cause second compilation of a.cpp 
 exe f : a.cpp b.cxx obj_1 obj_2 lib//auxilliary ;
 
diff --git a/v2/test/generators-test/c.ui b/v2/test/generators-test/c.tui
similarity index 100%
rename from v2/test/generators-test/c.ui
rename to v2/test/generators-test/c.tui
diff --git a/v2/test/generators-test/lex.jam b/v2/test/generators-test/lex.jam
index b6bf5cfbb..80fc651e8 100644
--- a/v2/test/generators-test/lex.jam
+++ b/v2/test/generators-test/lex.jam
@@ -18,7 +18,8 @@ rule lex ( targets * : sources * : properties * )
     print.output $(<) ;
     # Need to supress SunCC's warning about empty source
     # file.
-    print.text "void foo() {}" ;
+    print.text "void foo() {}
+" ;
 }
 
 actions lex 
diff --git a/v2/test/generators-test/project-root.jam b/v2/test/generators-test/project-root.jam
index 5e30c340b..7878cf2d2 100644
--- a/v2/test/generators-test/project-root.jam
+++ b/v2/test/generators-test/project-root.jam
@@ -7,9 +7,9 @@ import extra ;
 
 import type ;
 
-type.register UI : ui ;
-type.register UIC_H ;
-type.set-generated-target-suffix UIC_H : : h ;
+type.register tUI : tui ;
+type.register tUIC_H ;
+type.set-generated-target-suffix tUIC_H : : h ;
 
 type.register X1 : x1 ;
 type.register X2 : x2  ;
@@ -17,8 +17,8 @@ type.register X_PRO : x_pro ;
 
 import generators ;
 
-generators.register-standard qt.uic : UI UIC_H : CPP ;
-generators.register-standard qt.uic-h : UI : UIC_H ;
+generators.register-standard qt.uic : tUI tUIC_H : CPP ;
+generators.register-standard qt.uic-h : tUI : tUIC_H ;
 
 # That's an interesting example. Currently, X_PRO will be processed
 # twice.