ant-contrib-cvs

[Curt A. <ca...@us...>]

Update of /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/gcc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26613/test/junit/net/sf/antcontrib/cpptasks/gcc

Modified Files:
	TestAbstractArLibrarian.java TestGccLinker.java 
Log Message:
versioninfo support for msvc and bcc (bug 941119)

Index: TestAbstractArLibrarian.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/gcc/TestAbstractArLibrarian.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestAbstractArLibrarian.java	5 May 2004 03:50:44 -0000	1.5
--- TestAbstractArLibrarian.java	11 May 2004 04:50:12 -0000	1.6
***************
*** 74,78 ****
       */
      public void testOutputFileName() {
!         String[] outputFiles = GccLibrarian.getInstance().getOutputFileNames("x");
          assertEquals("libx.a", outputFiles[0]);
      }
--- 74,78 ----
       */
      public void testOutputFileName() {
!         String[] outputFiles = GccLibrarian.getInstance().getOutputFileNames("x", null);
          assertEquals("libx.a", outputFiles[0]);
      }

Index: TestGccLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/test/junit/net/sf/antcontrib/cpptasks/gcc/TestGccLinker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestGccLinker.java	5 May 2004 03:50:44 -0000	1.4
--- TestGccLinker.java	11 May 2004 04:50:12 -0000	1.5
***************
*** 46,50 ****
          linkType.setOutputType(outputType);
          Linker pluginLinker = linker.getLinker(linkType);
!         assertEquals("libfoo.bundle", pluginLinker.getOutputFileNames("foo")[0]);
      }
      public void testGetLinkerDarwinShared() {
--- 46,50 ----
          linkType.setOutputType(outputType);
          Linker pluginLinker = linker.getLinker(linkType);
!         assertEquals("libfoo.bundle", pluginLinker.getOutputFileNames("foo", null)[0]);
      }
      public void testGetLinkerDarwinShared() {
***************
*** 56,60 ****
          linkType.setOutputType(outputType);
          Linker sharedLinker = linker.getLinker(linkType);
!         assertEquals("libfoo.dylib", sharedLinker.getOutputFileNames("foo")[0]);
      }
      public void testGetLinkerNonDarwinPlugin() {
--- 56,60 ----
          linkType.setOutputType(outputType);
          Linker sharedLinker = linker.getLinker(linkType);
!         assertEquals("libfoo.dylib", sharedLinker.getOutputFileNames("foo", null)[0]);
      }
      public void testGetLinkerNonDarwinPlugin() {
***************
*** 66,70 ****
          linkType.setOutputType(outputType);
          Linker pluginLinker = linker.getLinker(linkType);
!         assertEquals("libfoo.so", pluginLinker.getOutputFileNames("foo")[0]);
      }
      public void testGetLinkerNonDarwinShared() {
--- 66,70 ----
          linkType.setOutputType(outputType);
          Linker pluginLinker = linker.getLinker(linkType);
!         assertEquals("libfoo.so", pluginLinker.getOutputFileNames("foo", null)[0]);
      }
      public void testGetLinkerNonDarwinShared() {
***************
*** 76,80 ****
          linkType.setOutputType(outputType);
          Linker sharedLinker = linker.getLinker(linkType);
!         assertEquals("libfoo.so", sharedLinker.getOutputFileNames("foo")[0]);
      }
  }
--- 76,80 ----
          linkType.setOutputType(outputType);
          Linker sharedLinker = linker.getLinker(linkType);
!         assertEquals("libfoo.so", sharedLinker.getOutputFileNames("foo", null)[0]);
      }
  }