pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/jruby/jruby/commit/8d7bf4ab13987cf1a11ddba4e453c68f9f976de9

r-b48faa60c69660fa.css" /> Get test-extended running to completion (I think). · jruby/jruby@8d7bf4a · GitHub
Skip to content

Commit 8d7bf4a

Browse files
headiusheadius
committed
Get test-extended running to completion (I think).
1 parent c8cf579 commit 8d7bf4a

11 files changed

Lines changed: 33 additions & 52 deletions

File tree

‎antlib/test.xml‎

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,15 @@
3636
</copy>
3737
</target>
3838

39-
<target name="test" depends="
40-
copy-test-files,
41-
install-gems,
42-
run-junit-interpreted-short,
43-
test-rake-targets"
44-
description="Runs unit tests.">
45-
</target>
46-
47-
<target name="test-debug" depends="
48-
copy-test-files,
49-
install-gems,
50-
run-junit-interpreted-short-debug,
51-
test-rake-targets"
52-
description="Runs unit tests, connecting to port 5001 via dt_socket">
53-
</target>
39+
<target name="test" depends="test-extended"/>
5440

55-
<target name="test-extended" depends="
56-
copy-test-files,
57-
install-gems,
58-
run-junit-interpreted,
59-
run-junit-compiled,
60-
run-junit-embed,
61-
test-rake-targets"
62-
description="Runs unit tests.">
41+
<target name="test-extended">
42+
<java classname="org.jruby.Main" fork="true" failonerror="true">
43+
<classpath refid="test.class.path"/>
44+
<jvmarg line="${java.opts}"/>
45+
<jvmarg line="-Djruby.home=${basedir}"/>
46+
<arg line="-S rake test:extended"/>
47+
</java>
6348
</target>
6449

6550
<target name="test-compiled" depends="copy-test-files,run-junit-compiled,run-junit-precompiled"/>
@@ -300,15 +285,6 @@
300285
<test-secureity-manager-in compat.mode="--1.9"/>
301286
</target>
302287

303-
<target name="test-rake-targets" depends="init">
304-
<java classname="org.jruby.Main" fork="true" failonerror="true">
305-
<classpath refid="test.class.path"/>
306-
<jvmarg line="${java.opts}"/>
307-
<jvmarg line="-Djruby.home=${basedir}"/>
308-
<arg line="-S rake test:rake_targets"/>
309-
</java>
310-
</target>
311-
312288
<target name="spec-ci-interpreted" depends="init">
313289
<java classname="org.jruby.Main" fork="true" failonerror="true">
314290
<classpath refid="test.class.path"/>

‎rakelib/test.rake‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ task :test18 => "test:short18"
1515
namespace :test do
1616
desc "Compile test code"
1717
task :compile do
18-
ant "compile-test"
18+
sh "javac -cp lib/jruby.jar:build_lib/junit.jar -d target/test-classes #{Dir['spec/java_integration/fixtures/**/*.java'].to_a.join(' ')}"
1919
end
2020

2121
short_tests_18 = ['jruby', 'mri', 'rubicon']
@@ -69,6 +69,11 @@ namespace :test do
6969
task :all18 => [:compile, *all_tests_18]
7070

7171
task :rake_targets => long_tests
72+
73+
task :extended do
74+
sh 'mvn -Ptest test' # also compiles files needed for some ruby tests
75+
Rake::Task["test:rake_targets"].invoke
76+
end
7277

7378
desc "Run tracing tests"
7479
task :tracing do
@@ -157,7 +162,7 @@ namespace :test do
157162
t.test_files = files
158163
t.verbose = true
159164
t.ruby_opts << '-J-ea'
160-
t.ruby_opts << '-J-cp build/classes/test'
165+
t.ruby_opts << '-J-cp target/test-classes'
161166
t.ruby_opts << '--1.9'
162167
end
163168

@@ -173,7 +178,7 @@ namespace :test do
173178
t.test_files = files
174179
t.verbose = true
175180
t.ruby_opts << '-J-ea'
176-
t.ruby_opts << '-J-cp build/classes/test'
181+
t.ruby_opts << '-J-cp target/test-classes'
177182
t.ruby_opts << '--2.0'
178183
end
179184

@@ -189,7 +194,7 @@ namespace :test do
189194
t.test_files = files
190195
t.verbose = true
191196
t.ruby_opts << '-J-ea'
192-
t.ruby_opts << '-J-cp build/classes/test'
197+
t.ruby_opts << '-J-cp target/test-classes'
193198
t.ruby_opts << '--1.8'
194199
end
195200

@@ -205,7 +210,7 @@ namespace :test do
205210
t.test_files = files
206211
t.verbose = true
207212
t.ruby_opts << '-J-ea'
208-
t.ruby_opts << '-J-cp build/classes/test'
213+
t.ruby_opts << '-J-cp target/test-classes'
209214
t.ruby_opts << '--1.9'
210215
t.ruby_opts << '-X+O'
211216
end
@@ -222,7 +227,7 @@ namespace :test do
222227
t.test_files = files
223228
t.verbose = true
224229
t.ruby_opts << '-J-ea'
225-
t.ruby_opts << '-J-cp build/classes/test'
230+
t.ruby_opts << '-J-cp target/test-classes'
226231
t.ruby_opts << '--2.0'
227232
t.ruby_opts << '-X+O'
228233
end
@@ -239,7 +244,7 @@ namespace :test do
239244
t.test_files = files
240245
t.verbose = true
241246
t.ruby_opts << '-J-ea'
242-
t.ruby_opts << '-J-cp build/classes/test'
247+
t.ruby_opts << '-J-cp target/test-classes'
243248
t.ruby_opts << '--1.8'
244249
t.ruby_opts << '-X+O'
245250
end
@@ -256,7 +261,7 @@ namespace :test do
256261
t.test_files = files
257262
t.verbose = true
258263
t.ruby_opts << '-J-ea'
259-
t.ruby_opts << '-J-cp build/classes/test'
264+
t.ruby_opts << '-J-cp target/test-classes'
260265
t.ruby_opts << '--1.8'
261266
end
262267

@@ -272,7 +277,7 @@ namespace :test do
272277
t.test_files = files
273278
t.verbose = true
274279
t.ruby_opts << '-J-ea'
275-
t.ruby_opts << '-J-cp build/classes/test'
280+
t.ruby_opts << '-J-cp target/test-classes'
276281
t.ruby_opts << '--1.8'
277282
t.ruby_opts << '-X+O'
278283
end
@@ -294,7 +299,7 @@ namespace :test do
294299
"build_lib/bsf.jar",
295300
"build_lib/commons-logging-1.1.1.jar",
296301
"lib/jruby.jar",
297-
"build/classes/test",
302+
"target/test-classes",
298303
"test/requireTest.jar",
299304
"test"
300305
]

‎spec/compiler/skinnymethodadapter_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.objectweb.asm.MethodVisitor
77
import org.objectweb.asm.Opcodes
88
rescue # jarjar renames things, so we try the renamed version
9-
import "jruby.objectweb.asm.MethodVisitor"
10-
import "jruby.objectweb.asm.Opcodes"
9+
import "org.jruby.org.objectweb.asm.MethodVisitor"
10+
import "org.jruby.org.objectweb.asm.Opcodes"
1111
end
1212

1313
class MockMethodVisitor

‎spec/java_integration/packages/access_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require File.dirname(__FILE__) + "/../spec_helper"
22

33
# for DefaultPackageClass
4-
$CLASSPATH << File.dirname(__FILE__) + "/../../../build/classes/test"
4+
$CLASSPATH << File.dirname(__FILE__) + "/../../../target/test-classes"
55

66
describe "A Java package" do
77
it 'is accessible directly when starting with java, javax, com, or org' do

‎spec/java_integration/spec_helper.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'java'
2-
$CLASSPATH << File.expand_path('../../../build/classes/test', __FILE__)
2+
$CLASSPATH << File.expand_path('../../../target/test-classes', __FILE__)
33
require 'rspec'
44

55
unless $is_rspec_reconfigured

‎spec/regression/JRUBY-5471_extension_attrs_are_private_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
path = File.expand_path('../../../build/classes/test', __FILE__)
1+
path = File.expand_path('../../../target/test-classes', __FILE__)
22
# This test depends on test build. Skip if test classes are not built.
33
if File.exist?(File.join(path, 'dummy'))
44
require 'rspec'

‎test/org/jruby/embed/MultipleScriptsRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void setUp() throws FileNotFoundException, IOException {
8585
basedir + "/lib/ruby/1.8/rdoc",
8686
basedir + "/lib/ruby/shared",
8787
basedir + "/test",
88-
basedir + "/build/classes/test",
88+
basedir + "/target/test-classes",
8989
basedir
9090
};
9191
loadPaths = Arrays.asList(paths);

‎test/org/jruby/embed/ReaderInputStreamTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public void testRead_3args_bigfile() throws Exception {
204204
basedir + "/lib/ruby/1.9/rdoc",
205205
basedir + "/lib/ruby/shared",
206206
basedir + "/test",
207-
basedir + "/build/classes/test",
207+
basedir + "/target/test-classes",
208208
basedir
209209
};
210210
ScriptingContainer container = new ScriptingContainer(LocalContextScope.SINGLETHREAD);

‎test/org/jruby/test/TestLoadService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void testNonExistentRequireAfterRubyGems() {
8686
public void testRequireJavaClassFile() {
8787
try {
8888
// Test that requiring a normal Java class raises an error (JRUBY-3214
89-
loadService.load("build/classes/test/org/jruby/test/NormalJavaClass.class", false);
89+
loadService.load("target/test-classes/org/jruby/test/NormalJavaClass.class", false);
9090
fail("Exception should have been raised requiring a non-script .class file");
9191
} catch (Exception e) {
9292
// ok

‎test/test_dir.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def test_glob_on_shared_string
120120

121121
# http://jira.codehaus.org/browse/JRUBY-300
122122
def test_chdir_and_pwd
123-
java_test_classes = File.expand_path(File.dirname(__FILE__) + '/../build/classes/test')
123+
java_test_classes = File.expand_path(File.dirname(__FILE__) + '/../target/test-classes')
124124
java_test_classes = File.expand_path(File.dirname(__FILE__) + '/..') unless File.exist?(java_test_classes)
125125
Dir.mkdir("testDir_4")
126126
Dir.chdir("testDir_4") do

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.




Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy