System.Data.SQLite
Check-in [c3d7f73889]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Make it possible for the managed and native test configuration suffixes to differ.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | preRelease
Files: files | file ages | folders
SHA1: c3d7f73889386cb041d71f0015fd8efe39ae0587
User & Date: mistachkin 2018-08-13 19:47:30
Context
2018-08-13
20:12
Update the CHM file for release 1.0.109.0. check-in: 7664bb096b user: mistachkin tags: preRelease
19:47
Make it possible for the managed and native test configuration suffixes to differ. check-in: c3d7f73889 user: mistachkin tags: preRelease
19:09
Correct configuration suffix handling in the .NET Standard test batch tool. check-in: 15814cefdc user: mistachkin tags: preRelease
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Externals/Eagle/lib/Eagle1.0/vendor.eagle.

356
357
358
359
360
361
362

363
364
365
366
367
368
369
370
371
372
373
374
375
        build_directory common_directory compile_option_prefix \
        connection_flags core_library_version database_directory \
        datetime_format define_constant_prefix execute_on_setup \
        interop_assembly_file_names native_library_file_names \
        release_version scratch_directory temporary_directory test_clr \
        test_clr_v2 test_clr_v4 test_configuration test_configurations \
        test_configuration_suffix test_constraints test_extra test_extras \

        test_machine test_native_year test_net_fx test_net_fx_2005 \
        test_net_fx_2008 test_net_fx_2010 test_net_fx_2012 test_net_fx_2013 \
        test_net_fx_2015 test_net_fx_2017 test_overrides test_platform \
        test_suite test_year test_years test_year_clr_v2 test_year_clr_v4 \
        vendor_directory vendor_test_directory]}] \
        [checkForVendorQuiet checkForTestOverrides]

    #
    # NOTE: Set the name of the running test suite, if necessary.
    #
    if {![info exists test_suite]} then {
      set test_suite "System.Data.SQLite Test Suite for Eagle"
    }







>
|
|
|
|
<
|







356
357
358
359
360
361
362
363
364
365
366
367

368
369
370
371
372
373
374
375
        build_directory common_directory compile_option_prefix \
        connection_flags core_library_version database_directory \
        datetime_format define_constant_prefix execute_on_setup \
        interop_assembly_file_names native_library_file_names \
        release_version scratch_directory temporary_directory test_clr \
        test_clr_v2 test_clr_v4 test_configuration test_configurations \
        test_configuration_suffix test_constraints test_extra test_extras \
        test_machine test_native_configuration_suffix test_native_year \
        test_net_fx test_net_fx_2005 test_net_fx_2008 test_net_fx_2010 \
        test_net_fx_2012 test_net_fx_2013 test_net_fx_2015 test_net_fx_2017 \
        test_overrides test_platform test_suite test_year test_years \
        test_year_clr_v2 test_year_clr_v4 vendor_directory \

        vendor_test_directory]}] [checkForVendorQuiet checkForTestOverrides]

    #
    # NOTE: Set the name of the running test suite, if necessary.
    #
    if {![info exists test_suite]} then {
      set test_suite "System.Data.SQLite Test Suite for Eagle"
    }

Changes to Setup/run-netstandard20-tests-debug.sh.

18
19
20
21
22
23
24
25
26
SQLITE_INTEROP_FILE=$SQLITE_INTEROP_DIR/$libname

if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then
  cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll"
  libname=SQLite.Interop.dll
fi

dotnet exec Externals/Eagle/bin/netStandard20/EagleShell.dll -preInitialize "set test_configuration Debug; set test_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_year NetStandard20; set test_native_year {$SQLITE_NET_YEAR}" -file Tests/all.eagle "$@"
popd







|

18
19
20
21
22
23
24
25
26
SQLITE_INTEROP_FILE=$SQLITE_INTEROP_DIR/$libname

if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then
  cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll"
  libname=SQLite.Interop.dll
fi

dotnet exec Externals/Eagle/bin/netStandard20/EagleShell.dll -preInitialize "set test_configuration Debug; set test_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_native_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_year NetStandard20; set test_native_year {$SQLITE_NET_YEAR}" -file Tests/all.eagle "$@"
popd

Changes to Setup/run-netstandard20-tests-release.sh.

18
19
20
21
22
23
24
25
26
SQLITE_INTEROP_FILE=$SQLITE_INTEROP_DIR/$libname

if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then
  cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll"
  libname=SQLite.Interop.dll
fi

dotnet exec Externals/Eagle/bin/netStandard20/EagleShell.dll -preInitialize "set test_configuration Release; set test_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_year NetStandard20; set test_native_year {$SQLITE_NET_YEAR}" -file Tests/all.eagle "$@"
popd







|

18
19
20
21
22
23
24
25
26
SQLITE_INTEROP_FILE=$SQLITE_INTEROP_DIR/$libname

if [[ -f "${SQLITE_INTEROP_FILE}" ]]; then
  cp "$SQLITE_INTEROP_FILE" "$SQLITE_INTEROP_DIR/SQLite.Interop.dll"
  libname=SQLite.Interop.dll
fi

dotnet exec Externals/Eagle/bin/netStandard20/EagleShell.dll -preInitialize "set test_configuration Release; set test_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_native_configuration_suffix {$SQLITE_NET_CONFIGURATION_SUFFIX}; set test_year NetStandard20; set test_native_year {$SQLITE_NET_YEAR}" -file Tests/all.eagle "$@"
popd

Changes to Setup/test_net_standard_20.bat.

177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
  IF NOT DEFINED NATIVE_YEAR (
    ECHO Cannot run .NET Core test suite, missing native year.
    CALL :fn_SetErrorLevel
    GOTO :EOF
  )
  SET CONFIGURATION=%NATIVE_CONFIGURATION%
  SET CONFIGURATION=%CONFIGURATION:NativeOnly=%
  SET CONFIGURATION=%CONFIGURATION%NetStandard20
  IF EXIST "bin\%YEAR%\%CONFIGURATION%\bin" (
    IF EXIST "bin\%NATIVE_YEAR%\%PLATFORM%\%NATIVE_CONFIGURATION%" (
      %__ECHO% "%DOTNET%" %SUBCOMMANDS% "Externals\Eagle\bin\netStandard20\%EAGLESHELL%" %PREARGS% -anyInitialize "set test_year {%YEAR%}; set test_native_year {%NATIVE_YEAR%}; set test_configuration {%CONFIGURATION%}" -file "%TEST_FILE%" %POSTARGS%
      IF ERRORLEVEL 1 (
        ECHO Testing of "%YEAR%/%NATIVE_YEAR%/%CONFIGURATION%" .NET Standard 2.0 assembly failed.
        CALL :fn_SetErrorLevel
        GOTO :EOF
      )
    ) ELSE (
      %_AECHO% Native directory "bin\%NATIVE_YEAR%\%PLATFORM%\%NATIVE_CONFIGURATION%" not found, skipped.
    )
  ) ELSE (
    %_AECHO% Managed directory "bin\%YEAR%\%CONFIGURATION%\bin" not found, skipped.
  )
  GOTO :EOF

:fn_SetVariable
  SETLOCAL
  SET __ECHO_CMD=ECHO %%%2%%
  FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (







<
|

|









|







177
178
179
180
181
182
183

184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
  IF NOT DEFINED NATIVE_YEAR (
    ECHO Cannot run .NET Core test suite, missing native year.
    CALL :fn_SetErrorLevel
    GOTO :EOF
  )
  SET CONFIGURATION=%NATIVE_CONFIGURATION%
  SET CONFIGURATION=%CONFIGURATION:NativeOnly=%

  IF EXIST "bin\%YEAR%\%CONFIGURATION%NetStandard20\bin" (
    IF EXIST "bin\%NATIVE_YEAR%\%PLATFORM%\%NATIVE_CONFIGURATION%" (
      %__ECHO% "%DOTNET%" %SUBCOMMANDS% "Externals\Eagle\bin\netStandard20\%EAGLESHELL%" %PREARGS% -anyInitialize "set test_year {%YEAR%}; set test_native_year {%NATIVE_YEAR%}; set test_configuration {%CONFIGURATION%}; set test_configuration_suffix NetStandard20" -file "%TEST_FILE%" %POSTARGS%
      IF ERRORLEVEL 1 (
        ECHO Testing of "%YEAR%/%NATIVE_YEAR%/%CONFIGURATION%" .NET Standard 2.0 assembly failed.
        CALL :fn_SetErrorLevel
        GOTO :EOF
      )
    ) ELSE (
      %_AECHO% Native directory "bin\%NATIVE_YEAR%\%PLATFORM%\%NATIVE_CONFIGURATION%" not found, skipped.
    )
  ) ELSE (
    %_AECHO% Managed directory "bin\%YEAR%\%CONFIGURATION%NetStandard20\bin" not found, skipped.
  )
  GOTO :EOF

:fn_SetVariable
  SETLOCAL
  SET __ECHO_CMD=ECHO %%%2%%
  FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO (

Changes to lib/System.Data.SQLite/common.eagle.

429
430
431
432
433
434
435




















436
437
438
439
440
441
442
...
922
923
924
925
926
927
928
929

930
931
932
933
934
935
936
      } else {
        #
        # NOTE: Use the default list of test configurations.
        #
        return [list Debug Release]
      }
    }




















 
    proc getBuildExtra {} {
      if {[info exists ::test_extra] && \
          [string length $::test_extra] > 0} then {
        #
        # NOTE: Use the specified extra output directory.
        #
................................................................................
        #       how to set this variable.
        #
        set native [expr {!$managedOnly && [hasRuntimeOption native]}]

        return [joinBuildDirectory $native [getBuildBaseDirectory] \
            [expr {$managedOnly ? [getBuildYear] : [getBuildNativeYear]}] \
            [getBuildPlatform $native] [appendArgs [getBuildConfiguration] \
            [getBuildConfigurationSuffix]] [expr {$managedOnly ? \

            [getBuildExtra] : ""}]]
      }
    }
 
    proc getReleaseVersion {} {
      #
      # NOTE: Figure out the release version for use with the build directory







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







|
>







429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
...
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
      } else {
        #
        # NOTE: Use the default list of test configurations.
        #
        return [list Debug Release]
      }
    }
 
    proc getBuildNativeConfigurationSuffix {} {
      #
      # NOTE: See if the test native configuration suffix has been
      #       overridden by the user (e.g. on the command line).
      #
      if {[info exists ::test_native_configuration_suffix] && \
          [string length $::test_native_configuration_suffix] > 0} then {
        #
        # NOTE: Use the specified test native configuration suffix.
        #
        return $::test_native_configuration_suffix
      } else {
        #
        # NOTE: Use the default test native configuration suffix, which
        #       should be an empty string.
        #
        return ""
      }
    }
 
    proc getBuildExtra {} {
      if {[info exists ::test_extra] && \
          [string length $::test_extra] > 0} then {
        #
        # NOTE: Use the specified extra output directory.
        #
................................................................................
        #       how to set this variable.
        #
        set native [expr {!$managedOnly && [hasRuntimeOption native]}]

        return [joinBuildDirectory $native [getBuildBaseDirectory] \
            [expr {$managedOnly ? [getBuildYear] : [getBuildNativeYear]}] \
            [getBuildPlatform $native] [appendArgs [getBuildConfiguration] \
            [expr {$managedOnly ? [getBuildConfigurationSuffix] : \
            [getBuildNativeConfigurationSuffix]}]] [expr {$managedOnly ? \
            [getBuildExtra] : ""}]]
      }
    }
 
    proc getReleaseVersion {} {
      #
      # NOTE: Figure out the release version for use with the build directory