tests: Remove redundant test and include_directories('.')

pull/3577/head
Niclas Moeslund Overby 7 years ago
parent ec7b834b6e
commit ef16fb2e97
  1. 3
      test cases/java/2 subdir/sub/meson.build
  2. 1
      test cases/java/5 includedirs/meson.build
  3. 0
      test cases/java/6 codegen/com/mesonbuild/Config.java.in
  4. 0
      test cases/java/6 codegen/com/mesonbuild/Simple.java
  5. 0
      test cases/java/6 codegen/com/mesonbuild/TextPrinter.java
  6. 0
      test cases/java/6 codegen/com/mesonbuild/meson.build
  7. 0
      test cases/java/6 codegen/meson.build
  8. 8
      test cases/java/6 no includedirs/com/mesonbuild/Simple.java
  9. 14
      test cases/java/6 no includedirs/meson.build
  10. 14
      test cases/java/7 codegen/com/mesonbuild/TextPrinter.java

@ -1,6 +1,5 @@
javaprog = jar('myprog',
'com/mesonbuild/Simple.java',
'com/mesonbuild/TextPrinter.java',
main_class : 'com.mesonbuild.Simple',
include_directories : include_directories('.'))
main_class : 'com.mesonbuild.Simple')
test('subdirtest', javaprog)

@ -10,6 +10,5 @@ javaprog = jar('myprog',
'com/mesonbuild/TextPrinter.java',
main_class : 'com.mesonbuild.Simple',
include_directories : [ include_directories('com'),
include_directories('.'),
include_directories('com/mesonbuild') ])
test('subdirtest', javaprog)

@ -1,8 +0,0 @@
package com.mesonbuild;
class Simple {
public static void main(String [] args) {
TextPrinter t = new TextPrinter("Printing from Java.");
t.print();
}
}

@ -1,14 +0,0 @@
# It used to be necessary to pass:
#
# include_directories: include_directories('.')
#
# to any use of jar() to compile source code with inter-file class
# dependencies. This is now the default behaviour.
project('noincludedirsjava', 'java')
javaprog = jar('myprog',
'com/mesonbuild/Simple.java',
'com/mesonbuild/TextPrinter.java',
main_class : 'com.mesonbuild.Simple')
test('subdirtest', javaprog)

@ -1,14 +0,0 @@
package com.mesonbuild;
class TextPrinter {
private String msg;
TextPrinter(String s) {
msg = s;
}
public void print() {
System.out.println(msg);
}
}
Loading…
Cancel
Save