Project

Profile

Help

Revision b8574960

Added by Norman Tovey-Walsh 8 months ago

Fix bugs in test suite driver setup

View differences:

build.gradle
53 53
if (!hasProperty("w3cXsdTestSuiteDir")) {
54 54
  ext.w3cXsdTestSuiteDir = System.getenv("W3C_XSD_TEST_SUITE_DIR")
55 55
}
56
if (!hasProperty("saxonQT3ExtraTestSuiteDir")) {
57
  ext.saxonQT3ExtraTestSuiteDir = System.getenv("SAXON_QT3EXTRA_TEST_SUITE_DIR")
58
}
56 59

  
57 60
dependencies {
58 61
  preprocessor (
......
380 383
  }
381 384
}
382 385

  
386
task cloneQT3ExtraTestSuite() {
387
  doLast {
388
    if (saxonQT3ExtraTestSuiteDir == null) {
389
      throw new GradleException("The location of the QT3 extra test suite is unknown.")
390
    }
391
  }
392
}
393

  
383 394
task cloneXsdTestSuite() {
384 395
  doLast {
385 396
    if (w3cXsdTestSuiteDir == null) {
......
444 455
                + files("${buildDir}/classes/${release}j") \
445 456
                + files("${buildDir}/testdriver_classes/${release}j")
446 457
    main = "${jpackage}.QT3TestDriver${RELEASE}"
447
    //args "-?"
448
    args "${w3cQT3TestSuiteDir}",
449
      "catalog.xml",
450
      "-o:${buildDir}/test-results/${release}j/qt3",
451
      "-lang:XQ31",
452
      "-qt30:on",
453
      "-bytecode:off"
458
    def testargs = ["${w3cQT3TestSuiteDir}",
459
                    "catalog.xml",
460
                    "-o:${buildDir}/test-results/${release}j/qt3",
461
                    "-lang:XQ31",
462
                    "-qt30:on",
463
                    testBytecode]
464
    if (testJit != "") {
465
      testargs = testargs + [ testJit ]
466
    }
467
    if (release == "ee" && testUnfolded != "") {
468
      testargs = testargs + [ testUnfolded ]
469
    }
470
    args testargs
454 471
  }
455 472

  
456 473
  task "${release}j_runXslt30TestSuiteDriver"(
......
463 480
                + files("${buildDir}/classes/${release}j") \
464 481
                + files("${buildDir}/testdriver_classes/${release}j")
465 482
    main = "${jpackage}.Xslt30TestSuiteDriver${RELEASE}"
466
    //args "-?"
467
    args "/Volumes/Saxonica/src/w3c/xslt30-test",
468
      "catalog.xml",
469
      "-o:${buildDir}/test-results/${release}j/xslt30",
470
      "-lang:XT30",
471
      "-qt30:on",
472
      "-bytecode:off"
483
    def testargs = ["${w3cXslt30TestSuiteDir}",
484
                    "catalog.xml",
485
                    "-o:${buildDir}/test-results/${release}j/xslt30",
486
                    "-lang:XT30",
487
                    "-qt30:on",
488
                    testBytecode]
489
    if (testJit != "") {
490
      testargs = testargs + [ testJit ]
491
    }
492
    if (testExport != "") {
493
      testargs = testargs + [ testExport ]
494
    }
495
    args testargs
496
  }
497

  
498
  if (release == "pe" || release == "ee") {
499
    task "${release}j_runQT3ExtraTestDriver"(
500
      type: JavaExec,
501
      dependsOn: ["${release}j_compileTestDrivers", "${release}j_setup_qt3extra_TestResults",
502
                  "cloneQT3ExtraTestSuite"],
503
      description: "Run the QT3 extra test suite driver for ${RELEASE}"
504
    ) {
505
      classpath = configurations.testDrivers \
506
                  + files("${buildDir}/classes/${release}j") \
507
                  + files("${buildDir}/testdriver_classes/${release}j")
508
      main = "${jpackage}.QT3TestDriver${RELEASE}"
509
      def testargs = ["${saxonQT3ExtraTestSuiteDir}",
510
                      "catalog.xml",
511
                      "-o:${buildDir}/test-results/${release}j/qt3extra",
512
                      "-lang:XQ31",
513
                      "-qt30:on",
514
                      testBytecode]
515
      if (testJit != "") {
516
        testargs = testargs + [ testJit ]
517
      }
518
      if (release == "ee" && testUnfolded != "") {
519
        testargs = testargs + [ testUnfolded ]
520
      }
521
      args testargs
522
    }
473 523
  }
474 524
}
475 525

  
......
1398 1448
task helloWorld() {
1399 1449
  doLast {
1400 1450
    println("Hello, world.")
1451
    println(testJit == "")
1401 1452
    /*
1402 1453
    configurations.documentation.resolve().each { path ->
1403 1454
      println(path)
gradle.properties
23 23

  
24 24
dotNetInstaller=extra/InnoSetup5/Compil32.exe
25 25

  
26
dockerCentos8Core=saxonica-centos8-core
27
dockerBuildContainer=saxonica-builder
28
dockerMonoContainer=saxonica-mono
29

  
30
dockerJdk=none
31
dockerJet=none
26
# For testing
27
testBytecode=-bytecode:off
28
testJit=
29
testExport=
30
testUnfolded=

Also available in: Unified diff