Changeset 723

Show
Ignore:
Timestamp:
08/16/07 08:07:46 (2 years ago)
Author:
dr2chase
Message:

junit.jar needs to be on classpath in build.xml; also updated testing shell scripts

Location:
trunk/ProjectFortress
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • trunk/ProjectFortress/.classpath

    r713 r723  
    55        <classpathentry kind="lib" path="third_party/junit/junit.jar" sourcepath="third_party/junit/junit_src.jar"/> 
    66        <classpathentry kind="lib" path="third_party/plt/plt.jar"/> 
    7         <classpathentry kind="lib" path="third_party/jsr166y/jsr166y.jar" sourcepath="third_party/jsr166y/jsr166/src/jsr166y"/> 
     7        <classpathentry kind="lib" path="third_party/jsr166y/jsr166y.jar" sourcepath="third_party/jsr166y/jsr166/src"/> 
    88        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    99        <classpathentry kind="output" path="build"/> 
  • trunk/ProjectFortress/build.xml

    r703 r723  
    7070 <property name="compile.classpath" value="${build}:${xtc}/xtc.jar:${jsr166y}/jsr166y.jar:${plt}/plt.jar:${junit}/junit.jar"/> 
    7171 <property environment="env"/> 
     72  
     73 <property name="blahblahblah" value="com/sun/fortress"/> 
    7274 
    7375    <target name="help"> 
     
    298300         </javac> 
    299301     </target> 
    300 <property name="blahblahblah" value="com/sun/fortress"/> 
    301302 
    302303    <target name="compileCommonLint" depends="init" 
     
    346347                <pathelement location="${jsr166y}/jsr166y.jar"/> 
    347348                <pathelement location="${plt}/plt.jar"/> 
     349                <pathelement location="${junit}/junit.jar"/> 
    348350            </classpath> 
    349351            <formatter type="plain" usefile="false"/> 
     
    377379             <pathelement location="${jsr166y}/jsr166y.jar"/> 
    378380             <pathelement location="${plt}/plt.jar"/> 
     381                <pathelement location="${junit}/junit.jar"/> 
    379382            </classpath> 
    380383            <formatter type="plain" usefile="true"/> 
     
    406409             <pathelement location="${xtc}/xtc.jar"/> 
    407410             <pathelement location="${plt}/plt.jar"/> 
     411                <pathelement location="${junit}/junit.jar"/> 
    408412            </classpath> 
    409413            <formatter type="brief" usefile="true"/> 
     
    432436              <pathelement location="${xtc}/xtc.jar"/> 
    433437              <pathelement location="${plt}/plt.jar"/> 
     438                <pathelement location="${junit}/junit.jar"/> 
    434439             </classpath> 
    435440             <formatter type="brief" usefile="true"/> 
  • trunk/ProjectFortress/test

    r605 r723  
    1919 
    2020if (uname | egrep -q CYGWIN) ; then  
    21   CP="build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/FJ/concurrent.jar;third_party/plt/plt.jar" 
     21  CP="build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/jsr166y/jsr166y.jar;third_party/plt/plt.jar" 
    2222else 
    23   CP="build:third_party/junit/junit.jar:third_party/xtc/xtc.jar:third_party/FJ/concurrent.jar:third_party/plt/plt.jar" 
     23  CP="build:third_party/junit/junit.jar:third_party/xtc/xtc.jar:third_party/jsr166y/jsr166y.jar:third_party/plt/plt.jar" 
    2424fi 
    2525 
  • trunk/ProjectFortress/test.bat

    r605 r723  
    1616REM ################################################################################ 
    1717 
    18 java -cp "build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/FJ/concurrent.jar;third_party/plt/plt.jar" junit.swingui.TestRunner com.sun.fortress.interpreter.drivers.SystemJUTests 
     18java -cp "build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/jsr166y/jsr166y.jar;third_party/plt/plt.jar" junit.swingui.TestRunner com.sun.fortress.interpreter.drivers.SystemJUTests 
  • trunk/ProjectFortress/testNPY

    r605 r723  
    1919 
    2020if (uname | egrep -q CYGWIN) ; then  
    21   CP="build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/FJ/concurrent.jar;third_party/plt/plt.jar" 
     21  CP="build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/jsr166y/jsr166y.jar;third_party/plt/plt.jar" 
    2222else 
    23   CP="build:third_party/junit/junit.jar:third_party/xtc/xtc.jar:third_party/FJ/concurrent.jar:third_party/plt/plt.jar" 
     23  CP="build:third_party/junit/junit.jar:third_party/xtc/xtc.jar:third_party/jsr166y/jsr166y.jar:third_party/plt/plt.jar" 
    2424fi 
    2525 
  • trunk/ProjectFortress/testSerialization

    r605 r723  
    2525 
    2626if (uname | egrep -q CYGWIN) ; then  
    27   CP="build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/FJ/concurrent.jar;third_party/plt/plt.jar" 
     27  CP="build;third_party/junit/junit.jar;third_party/xtc/xtc.jar;third_party/jsr166y/jsr166y.jar;third_party/plt/plt.jar" 
    2828else 
    29   CP="build:third_party/junit/junit.jar:third_party/xtc/xtc.jar:third_party/FJ/concurrent.jar:third_party/plt/plt.jar" 
     29  CP="build:third_party/junit/junit.jar:third_party/xtc/xtc.jar:third_party/jsr166y/jsr166y.jar:third_party/plt/plt.jar" 
    3030fi 
    3131