diff --git a/.azure/azure-pipelines-alpine.yml b/.azure/azure-pipelines-alpine.yml index 40a8d86c4..8c7c2501a 100644 --- a/.azure/azure-pipelines-alpine.yml +++ b/.azure/azure-pipelines-alpine.yml @@ -11,6 +11,7 @@ trigger: - '.azure/azure-pipelines-win.yml' - '.circleci/config.yml' - '.github/workflows/*' + - 'test/run-android-tests.sh' - 'README.md' resources: diff --git a/.azure/azure-pipelines-android.yml b/.azure/azure-pipelines-android.yml index fcb16bf30..92609c2b3 100644 --- a/.azure/azure-pipelines-android.yml +++ b/.azure/azure-pipelines-android.yml @@ -150,7 +150,6 @@ jobs: - script: | set -ex - sudo apt remove --purge --auto-remove cmake wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' @@ -232,7 +231,7 @@ jobs: - template: cmake-android.yml parameters: sourceDir: 'oboe-$(OBOE_VERSION)' - installCommand: 'cp liboboe.* ${PREFIX}/lib/ && cp -ur ../include/oboe ${PREFIX}/include' + installCommand: 'cp liboboe.* ${PREFIX}/lib/ && cp -R ../include/oboe ${PREFIX}/include' - script: | set -ex @@ -265,20 +264,84 @@ jobs: cmakeArgs: '-Denable-opensles=1 -Denable-floats=1 -Denable-oboe=1 -Denable-dbus=0 -Denable-oss=0 -Denable-openmp=0' installCommand: '' - - script: | - set -x - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(PREFIX)/lib:$(NDK_TOOLCHAIN)/sysroot/usr/lib/$(ARCH)-linux-android$(ANDROID_TARGET_ABI)/$(ANDROID_API) - pushd build - make -j$((`nproc`+1)) check - ldd test/test_sample_cache + # Build individual Android test executables + - bash: | + set -ex + pushd build_$(ANDROID_ABI_CMAKE) + make check popd - displayName: 'Execute fluidsynth unit test' - condition: and(succeeded(), in(variables['ARCH'], 'x86_64', 'i686')) - enabled: 'false' + # List built test executables for verification + find build_$(ANDROID_ABI_CMAKE) -name "*" -type f | head -10 + displayName: 'Build Android Test Executables' - - script: | + - bash: | + set -ex + # Grant the current CI user access to /dev/kvm so the emulator can use hardware acceleration. + # Without this, x86/x86_64 system images refuse to boot at all ("x86 emulation currently + # requires hardware acceleration!") because the KVM device is only group-readable/writable. + if [ -e /dev/kvm ]; then + sudo groupadd -f kvm + sudo usermod -aG kvm "$USER" + sudo chown root:kvm /dev/kvm + sudo chmod 660 /dev/kvm + # Apply the new group membership to this shell without needing to re-login. + sudo setfacl -m u:"$USER":rw /dev/kvm || true + else + echo "##[warning]/dev/kvm does not exist; hardware acceleration will not be available." + fi + + ls $ANDROID_HOME/cmdline-tools/ || true + cd $ANDROID_HOME/cmdline-tools/latest/bin + yes | ./sdkmanager --licenses > /dev/null 2>&1 + ./sdkmanager --list | grep system-images + ./sdkmanager 'system-images;android-$(ANDROID_API);default;$(ANDROID_ABI_CMAKE)' > /dev/null + ./sdkmanager --channel=3 emulator + echo "no" | ./avdmanager create avd -n android_emulator -k 'system-images;android-$(ANDROID_API);default;$(ANDROID_ABI_CMAKE)' --force + echo "Emulator created successfully $($ANDROID_HOME/emulator/emulator -list-avds), launching it" + + # NOTE: -gpu guest can stall on headless CI runners without a display/GPU. swiftshader_indirect + # is the software renderer explicitly recommended for headless emulator use. + # Emulator output is logged to a file (instead of discarded) so we can diagnose boot failures below. + nohup $ANDROID_HOME/emulator/emulator -avd android_emulator -no-window -no-snapshot -no-audio -no-boot-anim -accel auto -gpu swiftshader_indirect > $(Build.ArtifactStagingDirectory)/emulator.log 2>&1 & + emulatorPid=$! + + # adb wait-for-device only waits for the emulator's ADB transport to attach, which normally + # happens within seconds of a healthy boot. It never times out on its own, so if the emulator + # process fails/crashes/hangs during boot (e.g. no hardware acceleration available for this ABI), + # this would otherwise block for the entire job timeout. Bound it explicitly and fail fast with logs. + if ! timeout 300 $ANDROID_HOME/platform-tools/adb wait-for-device; then + echo "##[error]Timed out waiting for the emulator to attach via adb." + echo "--- emulator.log ---" + cat $(Build.ArtifactStagingDirectory)/emulator.log || true + echo "--- adb devices ---" + $ANDROID_HOME/platform-tools/adb devices -l || true + kill -9 $emulatorPid 2>/dev/null || true + exit 1 + fi + + # Set up environment and run individual test executables + # run-android-tests.sh calls plain "adb" (not the full path), so platform-tools must be on PATH. + export PATH="$PATH:$ANDROID_HOME/platform-tools" + export ANDROID_ABI_CMAKE="$(ANDROID_ABI_CMAKE)" + # BUILD_DIR must be absolute: run-android-tests.sh resolves it relative to its own cwd + # (test/), not the repo root, so a relative "build_x86_64" would never be found. + export BUILD_DIR="$(Build.SourcesDirectory)/build_$(ANDROID_ABI_CMAKE)" + export PREFIX="${PREFIX}" + + cd $(Build.SourcesDirectory)/test + ./run-android-tests.sh + + kill -9 $emulatorPid + displayName: 'Start emulator and execute individual test executables' + # armeabi-v7a and arm64-v8a system images cannot be hardware-accelerated on the x86_64 hosted + # agent (KVM only accelerates same-architecture guests; ARM-on-x86 always falls back to slow + # TCG software emulation), so booting them is impractically slow/unreliable in CI and is what + # caused this step to hang. Only run the emulator for the x86/x86_64 legs, which can use KVM. + condition: and(succeeded(), in(variables['ANDROID_ABI_CMAKE'], 'x86', 'x86_64')) + + - bash: | set -ex - pushd build + pushd build_$(ANDROID_ABI_CMAKE) make install popd displayName: 'Install fluidsynth' @@ -302,7 +365,7 @@ jobs: cd $(Build.ArtifactStagingDirectory)/lib/$(ANDROID_ABI_CMAKE) cp -LR $(PREFIX)/lib/* . ls -Rg . - rm -rf *.dll *.alias gettext/ libtextstyle.* *.a *.la + rm -Rf *.dll *.alias gettext/ libtextstyle.* *.a *.la rm -f *.so.* mkdir -p $(Build.ArtifactStagingDirectory)/include cd $(Build.ArtifactStagingDirectory)/include @@ -340,7 +403,7 @@ jobs: - script: | set -ex # as very last step before creating the pipeline cache, remove fluidsynth - pushd build + pushd build_$(ANDROID_ABI_CMAKE) make uninstall popd displayName: 'Uninstall fluidsynth' diff --git a/.azure/azure-pipelines-mac.yml b/.azure/azure-pipelines-mac.yml index fc518966a..a442b93fe 100644 --- a/.azure/azure-pipelines-mac.yml +++ b/.azure/azure-pipelines-mac.yml @@ -12,6 +12,7 @@ trigger: - '.azure/Dockerfile.azure-alpine' - '.circleci/config.yml' - '.github/workflows/*' + - 'test/run-android-tests.sh' - 'README.md' parameters: diff --git a/.azure/cmake-android.yml b/.azure/cmake-android.yml index 05d575db0..a01c70db7 100644 --- a/.azure/cmake-android.yml +++ b/.azure/cmake-android.yml @@ -21,8 +21,8 @@ steps: set -ex pushd ${{ parameters.sourceDir }} - mkdir -p build - pushd build + mkdir -p build_${ANDROID_ABI_CMAKE} + pushd build_${ANDROID_ABI_CMAKE} # Invoke cmake in the most correctest way I've could find while try and erroring: # diff --git a/.github/workflows/api_doc_build.yml b/.github/workflows/api_doc_build.yml index 945e36334..bcf244f13 100644 --- a/.github/workflows/api_doc_build.yml +++ b/.github/workflows/api_doc_build.yml @@ -12,6 +12,7 @@ on: - '.github/workflows/os2.yml' - '.github/workflows/sonarcloud.yml' - '.github/workflows/windows.yml' + - 'test/run-android-tests.sh' - 'README.md' workflow_dispatch: diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 56aa06e22..e1609fb03 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -16,6 +16,7 @@ on: - '.github/workflows/sonarcloud.yml' - '.github/workflows/solaris.yml' - '.github/workflows/windows.yml' + - 'test/run-android-tests.sh' - 'README.md' env: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 6cca3c32f..35a5baa2b 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -16,6 +16,7 @@ on: - '.github/workflows/windows.yml' - '.github/workflows/sonarcloud.yml' - '.github/workflows/rendering-regression.yml' + - 'test/run-android-tests.sh' - 'README.md' tags: - 'v*' diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 396f63382..8a4e579bb 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,6 +16,7 @@ on: - '.github/workflows/ios.yml' - '.github/workflows/os2.yml' - '.github/workflows/rendering-regression.yml' + - 'test/run-android-tests.sh' - 'README.md' env: diff --git a/.github/workflows/os2.yml b/.github/workflows/os2.yml index ee8f42553..6422648cb 100644 --- a/.github/workflows/os2.yml +++ b/.github/workflows/os2.yml @@ -16,6 +16,7 @@ on: - '.github/workflows/ios.yml' - '.github/workflows/linux.yml' - '.github/workflows/rendering-regression.yml' + - 'test/run-android-tests.sh' - 'README.md' env: diff --git a/.github/workflows/rendering-regression.yml b/.github/workflows/rendering-regression.yml index ef85e4d39..7854b2430 100644 --- a/.github/workflows/rendering-regression.yml +++ b/.github/workflows/rendering-regression.yml @@ -22,6 +22,7 @@ on: - '.github/workflows/os2.yml' - '.github/workflows/sonarcloud.yml' - '.github/workflows/windows.yml' + - 'test/run-android-tests.sh' - 'README.md' permissions: diff --git a/.github/workflows/solaris.yml b/.github/workflows/solaris.yml index c700dd2ef..8db184fa3 100644 --- a/.github/workflows/solaris.yml +++ b/.github/workflows/solaris.yml @@ -16,6 +16,7 @@ on: - '.github/workflows/rendering-regression.yml' - '.github/workflows/sonarcloud.yml' - '.github/workflows/windows.yml' + - 'test/run-android-tests.sh' - 'README.md' env: diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 1c1736513..96664d754 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -16,6 +16,7 @@ on: - '.github/workflows/ios.yml' - '.github/workflows/os2.yml' - '.github/workflows/rendering-regression.yml' + - 'test/run-android-tests.sh' - 'README.md' pull_request: types: [opened, synchronize, reopened] diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2ec247d48..edd93ff5e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,6 +17,7 @@ on: - '.github/workflows/ios.yml' - '.github/workflows/os2.yml' - '.github/workflows/rendering-regression.yml' + - 'test/run-android-tests.sh' - 'README.md' tags: - 'v*' diff --git a/CMakeLists.txt b/CMakeLists.txt index 12698572e..103e6594f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -804,13 +804,46 @@ if ( enable-signalsmith ) endif ( enable-signalsmith ) # manipulate some variables to setup a proper test env -set(TEST_SOUNDFONT "${FluidSynth_SOURCE_DIR}/sf2/VintageDreamsWaves-v2.sf2") -set(TEST_DLS "${FluidSynth_SOURCE_DIR}/sf2/VintageDreamsWaves-v2.dls") -set(TEST_SOUNDFONT_UTF8_1 "${FluidSynth_SOURCE_DIR}/sf2/\\xE2\\x96\\xA0VintageDreamsWaves-v2\\xE2\\x96\\xA0.sf2") -set(TEST_SOUNDFONT_UTF8_2 "${FluidSynth_SOURCE_DIR}/sf2/VìntàgèDrèàmsWàvès-v2.sf2") -set(TEST_SOUNDFONT_SF3 "${FluidSynth_SOURCE_DIR}/sf2/VintageDreamsWaves-v2.sf3") -set(TEST_MIDI_UTF8 "${FluidSynth_SOURCE_DIR}/test/ⓉⒺⓈⓉ.mid") -set(TEST_WAV_UTF8 "${FluidSynth_BINARY_DIR}/test/ⓉⒺⓈⓉ.wav") +# +# The unit tests resolve their test data relative to the current working +# directory (the test build dir on the host via ctest, the adb-pushed +# ${TEST_DIR} in the Android emulator), therefore TEST_* are plain relative +# paths. The actual files are staged into ${TEST_DATA_STAGE} mirroring their +# location relative to the source root (see TEST_DATA_FILES below), and on +# the Android emulator test/run-android-tests.sh pushes that staged tree to +# the device. +set(TEST_DATA_STAGE "${CMAKE_BINARY_DIR}/test") +set(TEST_DATA_FILES + "${FluidSynth_SOURCE_DIR}/sf2/VintageDreamsWaves-v2.sf2" + "${FluidSynth_SOURCE_DIR}/sf2/VintageDreamsWaves-v2.dls" + "${FluidSynth_SOURCE_DIR}/sf2/■VintageDreamsWaves-v2■.sf2" + "${FluidSynth_SOURCE_DIR}/sf2/VìntàgèDrèàmsWàvès-v2.sf2" + "${FluidSynth_SOURCE_DIR}/sf2/VintageDreamsWaves-v2.sf3" + "${FluidSynth_SOURCE_DIR}/test/ⓉⒺⓈⓉ.mid" +) +set(TEST_DATA_OUTPUTS "") +foreach(src IN LISTS TEST_DATA_FILES) + file(RELATIVE_PATH rel "${FluidSynth_SOURCE_DIR}" "${src}") + set(dst "${TEST_DATA_STAGE}/${rel}") + get_filename_component(dst_dir "${dst}" DIRECTORY) + add_custom_command( + OUTPUT "${dst}" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${dst_dir}" + COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${src}" "${dst}" + DEPENDS "${src}" + VERBATIM + ) + list(APPEND TEST_DATA_OUTPUTS "${dst}") +endforeach() +add_custom_target(test_data DEPENDS ${TEST_DATA_OUTPUTS}) + +set(TEST_SOUNDFONT "sf2/VintageDreamsWaves-v2.sf2") +set(TEST_DLS "sf2/VintageDreamsWaves-v2.dls") +set(TEST_SOUNDFONT_UTF8_1 "sf2/\\xE2\\x96\\xA0VintageDreamsWaves-v2\\xE2\\x96\\xA0.sf2") +set(TEST_SOUNDFONT_UTF8_2 "sf2/VìntàgèDrèàmsWàvès-v2.sf2") +set(TEST_SOUNDFONT_SF3 "sf2/VintageDreamsWaves-v2.sf3") +set(TEST_MIDI_UTF8 "test/ⓉⒺⓈⓉ.mid") +set(TEST_WAV_UTF8 "test/ⓉⒺⓈⓉ.wav") # Make sure to link against libm before checking for math functions below set ( CMAKE_REQUIRED_LIBRARIES "${LIBFLUID_LIBS};${WINDOWS_LIBS}" ) diff --git a/cmake_admin/FluidUnitTest.cmake b/cmake_admin/FluidUnitTest.cmake index 96af35659..e14d00688 100644 --- a/cmake_admin/FluidUnitTest.cmake +++ b/cmake_admin/FluidUnitTest.cmake @@ -26,7 +26,9 @@ macro ( ADD_FLUID_TEST _test ) ) # add the test to ctest - ADD_TEST(NAME ${_test} COMMAND ${_test}) + if( NOT ANDROID ) + ADD_TEST(NAME ${_test} COMMAND ${_test}) + endif() # append the current unit test to check-target as dependency add_dependencies(check ${_test}) diff --git a/test-android/.gitignore b/test-android/.gitignore deleted file mode 100644 index 0fd345ff6..000000000 --- a/test-android/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx -local.properties -.idea - -app/src/main/cpp/include/ -app/src/main/cpp/tests/ -app/src/main/jniLibs/ -test-names.txt diff --git a/test-android/README.md b/test-android/README.md deleted file mode 100644 index c7da4c007..000000000 --- a/test-android/README.md +++ /dev/null @@ -1,41 +0,0 @@ -# Android test runner - -It is meant to be an Android app that runs those fluidsynth tests under `../test` directory. - -It is not immediately doable because everything is based on ctest where each source has `main()` function that cannot be more than one within a shared library. Therefore, we generate the modified test sources into this standalone Android tester app. - -Also, since those tests have to access to libfluidsynth non-public implementation, we have to build the entire native test libraries (for each ABI), not with `libfluidsynth.so`. - -The application was based on Android Studio 4.2 (when it was created). - -## Building - -Here is a brief task list to generate, build, and run Android tests: - -- run `./convert-tests.sh` to generate runnable tests. -- run `build-scripts/download.sh` to download fluidsynth dependency archives to build from sources as Android dependencies. -- run `build-scripts/build-all-archs.sh` to build fluidsynth native libraries for Android. -- copy `build-scripts/build-artifacts/lib` contents into `app/src/main/jniLibs`. -- run `./gradlew connectedCheck` to build and run Android tests. - -Detailed explanation follows. - -(1) First of all, you have to generate the modified test sources as well as the native test runner from `../test` directory. `./convert-tests.sh` does this work for you. - -It is a simple sed script that expects various preconditions that those existing ctests meet at the moment when this script was created (e.g. test source filename can be used to construct a valid C function name, it must have `int main()` literally, it must be compilable among with other sources, etc.). This also overwrites `app/src/main/cpp/run_all_tests.c` - -You are supposed to run this every time the set of test files get updated. On CI builds it has to be run every time. This also applies when you want to try re-enabling those failing tests, adding exceptional tests that this converter cannot cover, or adding more failing tests. - -(2) Once you are done with generating tests, then the next step is to download all fluidsynth runtime dependencies. This can be done by `./download.sh`. It is based on (but not a complete copy of) [Azure DevOps CI build setup](https://github.com/FluidSynth/fluidsynth/blob/master/.azure/azure-pipelines-android.yml). You have to do once until the list of dependencies changes. On Azure DevOps this step is therefore already handled (when this notes were written). - -(3) Once you are done with downloading all those dependencies, the next step is to build fluidsynth for Android. Locally it can be achieved by `build-scripts/build-all-archs.sh`. It is (again) based on the Azure DevOps setup and therefore it is already handled there (when this notes were written). - -It will end up with `build-scripts/build-artifacts/` that contains a `include` directory and `lib/*` directories for each ABI, on local builds. (Azure DevOps builds it is `$(Build.ArtifactStagingDirectory)/lib/*`.) - -Once you have finished building fluidsynth for Android. there will be `$(topdir)/build_(ABI)` directories. While you want to build the Android tester app, you cannot remove them because those intermediate files (OBJ files) are referenced by this app's `CMakeLists.txt`. - -(4) The `lib` part from the above has to be copied into `app/src/main/jniLibs`. There should be `armeabi-v7a`, `arm64-v8a`, `x86`, and `x86_64` subdirectories. - -(5) After all the steps above are done, the Android tester app is ready to build and run. You can either open this directory as a project on Android Studio, or run `./gradlew build` to build the app, or run `./gradlew connectedCheck` to build and run the tests on a connected Android target (emulator or device). You can also run the tests by simply launching the MainActivity as it run there before showing the UI. - -Note that those tests have to run on an Android target otherwise it does not make sense. `./gradlew build` or `./gradlew check` runs "test" in the project, but it does not mean they run on an Android target. diff --git a/test-android/app/.gitignore b/test-android/app/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/test-android/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/test-android/app/build.gradle b/test-android/app/build.gradle deleted file mode 100644 index 87c11d0f4..000000000 --- a/test-android/app/build.gradle +++ /dev/null @@ -1,63 +0,0 @@ -plugins { - id 'com.android.application' - id 'kotlin-android' -} - -android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" - - defaultConfig { - applicationId "org.fluidsynth.fluidsynth_tests" - minSdkVersion 24 - targetSdkVersion 30 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - externalNativeBuild { - cmake { - cppFlags '' - arguments '-DANDROID_STL=c++_shared' - } - - if (project.hasProperty('customAbiFilters')) - ndk.abiFilters "$customAbiFilters" - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } - externalNativeBuild { - cmake { - path file('src/main/cpp/CMakeLists.txt') - version '3.16.0+' - } - } - buildFeatures { - viewBinding true - } -} - -dependencies { - - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.5.0' - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'com.google.android.material:material:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' -} diff --git a/test-android/app/proguard-rules.pro b/test-android/app/proguard-rules.pro deleted file mode 100644 index 481bb4348..000000000 --- a/test-android/app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/test-android/app/src/androidTest/java/org/fluidsynth/fluidsynth_tests/ExampleInstrumentedTest.kt b/test-android/app/src/androidTest/java/org/fluidsynth/fluidsynth_tests/ExampleInstrumentedTest.kt deleted file mode 100644 index a9469a0e1..000000000 --- a/test-android/app/src/androidTest/java/org/fluidsynth/fluidsynth_tests/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,27 +0,0 @@ -package org.fluidsynth.fluidsynth_tests - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.fluidsynth.fluidsynthtests.TestRunner - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("org.fluidsynth.fluidsynth_tests", appContext.packageName) - - TestRunner.runTests() - } -} \ No newline at end of file diff --git a/test-android/app/src/main/AndroidManifest.xml b/test-android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 41ea19b19..000000000 --- a/test-android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test-android/app/src/main/cpp/CMakeLists.txt b/test-android/app/src/main/cpp/CMakeLists.txt deleted file mode 100644 index b6a585999..000000000 --- a/test-android/app/src/main/cpp/CMakeLists.txt +++ /dev/null @@ -1,113 +0,0 @@ -# For more information about using CMake with Android Studio, read the -# documentation: https://d.android.com/studio/projects/add-native-code.html - -# Sets the minimum version of CMake required to build the native library. - -cmake_minimum_required(VERSION 3.10.2) - -# Declares and names the project. - -project("fluidsynth_tests") - -set (TEST_SRC_DIR ../../../../../test) - -# Creates and names a library, sets it as either STATIC -# or SHARED, and provides the relative paths to its source code. -# You can define multiple libraries, and CMake builds them for you. -# Gradle automatically packages shared libraries with your APK. - -AUX_SOURCE_DIRECTORY(tests TEST_SRC_FILES) -FILE(GLOB LINKED_OBJ_FILES ../../../../../build_${CMAKE_ANDROID_ARCH_ABI}/src/CMakeFiles/libfluidsynth-OBJ.dir/**/*.o) - -message("-----------------------TEST_SRC_FILES---------------------------") -message("${TEST_SRC_FILES}") -message("-----------------------LINKED_OBJ_FILES---------------------------") -message("${LINKED_OBJ_FILES}") - -add_library( # Sets the name of the library. - native-lib - - # Sets the library as a shared library. - SHARED - - # Provides a relative path to your source file(s). - ${LINKED_OBJ_FILES} - - tests/test_preset_pinning.c - tests/test_seq_event_queue_remove.c - tests/test_seq_scale.c - tests/test_jack_obtaining_synth.c - tests/test_settings_unregister_callback.c - tests/test_pointer_alignment.c - tests/test_sfont_zone.c - tests/test_utf8_open.c - tests/test_seqbind_unregister.c - tests/test_sf3_sfont_loading.c - tests/test_sample_cache.c - tests/test_synth_process.c - tests/test_ct2hz.c - tests/test_seq_evt_order.c - tests/test_snprintf.c - tests/test_seq_event_queue_sort.c - tests/test_sfont_loading.c - tests/test_preset_sample_loading.c - tests/test_sfont_unloading.c - tests/test_sample_rate_change.c - tests/test_sample_validate.c - tests/test_synth_chorus_reverb.c - tests/test_bug_635.c - - run_all_tests.c - native-lib.cpp - ) - -target_include_directories(native-lib - PRIVATE - ../../../../../build_${CMAKE_ANDROID_ARCH_ABI} - ../../../../build-scripts/build-artifacts/include - ../../../../build-scripts/android-build-root/${CMAKE_ANDROID_ARCH_ABI}/opt/android/include - ../../../../build-scripts/android-build-root/${CMAKE_ANDROID_ARCH_ABI}/opt/android/include/glib-2.0 - ../../../../build-scripts/android-build-root/${CMAKE_ANDROID_ARCH_ABI}/opt/android/lib/glib-2.0/include - ../../../../../src - ../../../../../src/bindings - ../../../../../src/drivers - ../../../../../src/midi - ../../../../../src/rvoice - ../../../../../src/sfloader - ../../../../../src/synth - ../../../../../src/utils - ../../../../../test - ) - -# Searches for a specified prebuilt library and stores the path as a -# variable. Because CMake includes system libraries in the search path by -# default, you only need to specify the name of the public NDK library -# you want to add. CMake verifies that the library exists before -# completing its build. - -find_library( # Sets the name of the path variable. - log-lib - - # Specifies the name of the NDK library that - # you want CMake to locate. - log ) - - -# Specifies libraries CMake should link to your target library. You -# can link multiple libraries, such as libraries you define in this -# build script, prebuilt third-party libraries, or system libraries. - -target_link_directories(native-lib - PRIVATE - ../jniLibs/${CMAKE_ANDROID_ARCH_ABI}) - -target_link_libraries(native-lib - ${log-lib} - c++_shared - gobject-2.0 - glib-2.0 - sndfile - instpatch-1.0 - OpenSLES - oboe - ) diff --git a/test-android/app/src/main/cpp/native-lib.cpp b/test-android/app/src/main/cpp/native-lib.cpp deleted file mode 100644 index 4c7c7fd55..000000000 --- a/test-android/app/src/main/cpp/native-lib.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include -#include - -extern "C" int run_all_fluidsynth_tests(); - -extern "C" JNIEXPORT void JNICALL Java_org_fluidsynth_fluidsynthtests_TestRunner_00024Companion_runTests(JNIEnv* env, jobject thiz) { - run_all_fluidsynth_tests(); -} diff --git a/test-android/app/src/main/java/org/fluidsynth/fluidsynthtests/MainActivity.kt b/test-android/app/src/main/java/org/fluidsynth/fluidsynthtests/MainActivity.kt deleted file mode 100644 index 4d9d60bb0..000000000 --- a/test-android/app/src/main/java/org/fluidsynth/fluidsynthtests/MainActivity.kt +++ /dev/null @@ -1,22 +0,0 @@ -package org.fluidsynth.fluidsynthtests - -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle -import org.fluidsynth.fluidsynthtests.databinding.ActivityMainBinding - -class MainActivity : AppCompatActivity() { - - private lateinit var binding: ActivityMainBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - binding = ActivityMainBinding.inflate(layoutInflater) - setContentView(binding.root) - - TestRunner.runTests() - - // Example of a call to a native method - binding.sampleText.text = "If this shows up then there was no reported test failure!" - } -} \ No newline at end of file diff --git a/test-android/app/src/main/java/org/fluidsynth/fluidsynthtests/TestRunner.kt b/test-android/app/src/main/java/org/fluidsynth/fluidsynthtests/TestRunner.kt deleted file mode 100644 index fd0fa3542..000000000 --- a/test-android/app/src/main/java/org/fluidsynth/fluidsynthtests/TestRunner.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.fluidsynth.fluidsynthtests - -class TestRunner { - companion object { - external fun runTests() - init { - System.loadLibrary("native-lib") - } - } -} \ No newline at end of file diff --git a/test-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/test-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d114..000000000 --- a/test-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/test-android/app/src/main/res/drawable/ic_launcher_background.xml b/test-android/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9cb..000000000 --- a/test-android/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test-android/app/src/main/res/layout/activity_main.xml b/test-android/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index a4e8d403b..000000000 --- a/test-android/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/test-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/test-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/test-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/test-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/test-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/test-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/test-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/test-android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a571e6009..000000000 Binary files a/test-android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/test-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551c5..000000000 Binary files a/test-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/test-android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index c41dd2853..000000000 Binary files a/test-android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/test-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a75..000000000 Binary files a/test-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/test-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 6dba46dab..000000000 Binary files a/test-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/test-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a871c..000000000 Binary files a/test-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/test-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 15ac68172..000000000 Binary files a/test-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/test-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d31..000000000 Binary files a/test-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/test-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index f25a41974..000000000 Binary files a/test-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/test-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/test-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index e96783ccc..000000000 Binary files a/test-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/test-android/app/src/main/res/values-night/themes.xml b/test-android/app/src/main/res/values-night/themes.xml deleted file mode 100644 index ba19bec50..000000000 --- a/test-android/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/test-android/app/src/main/res/values/colors.xml b/test-android/app/src/main/res/values/colors.xml deleted file mode 100644 index f8c6127d3..000000000 --- a/test-android/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/test-android/app/src/main/res/values/strings.xml b/test-android/app/src/main/res/values/strings.xml deleted file mode 100644 index 1b986a89b..000000000 --- a/test-android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - fluidsynth-tests - \ No newline at end of file diff --git a/test-android/app/src/main/res/values/themes.xml b/test-android/app/src/main/res/values/themes.xml deleted file mode 100644 index 75e5d0eb4..000000000 --- a/test-android/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/test-android/app/src/test/java/org/fluidsynth/fluidsynth_tests/ExampleUnitTest.kt b/test-android/app/src/test/java/org/fluidsynth/fluidsynth_tests/ExampleUnitTest.kt deleted file mode 100644 index 30064a67f..000000000 --- a/test-android/app/src/test/java/org/fluidsynth/fluidsynth_tests/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.fluidsynth.fluidsynth_tests - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/test-android/build-scripts/.gitignore b/test-android/build-scripts/.gitignore deleted file mode 100644 index 7c49c7676..000000000 --- a/test-android/build-scripts/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -android-build-root/ -archives/ -build-artifacts/ -wget-log - diff --git a/test-android/build-scripts/build-all-archs.sh b/test-android/build-scripts/build-all-archs.sh deleted file mode 100755 index c90370f49..000000000 --- a/test-android/build-scripts/build-all-archs.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -source ./build-env.sh - -mkdir -p $DEV - -# build - -ANDROID_ABI_CMAKE=armeabi-v7a ./extract.sh || exit 1 -ARCH='arm' ANDROID_ARCH='armv7a' ANDROID_ABI_CMAKE='armeabi-v7a' ANDROID_TARGET_ABI='eabi' AUTOTOOLS_TARGET="$ARCH-none-linux-android$ANDROID_TARGET_ABI" ./build.sh || exit 1 - -ANDROID_ABI_CMAKE=arm64-v8a ./extract.sh || exit 1 -ARCH='aarch64' ANDROID_ARCH='aarch64' ANDROID_ABI_CMAKE='arm64-v8a' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-none-linux-android" ./build.sh || exit 1 - -ANDROID_ABI_CMAKE=x86 ./extract.sh || exit 1 -ARCH='i686' ANDROID_ARCH='i686' ANDROID_ABI_CMAKE='x86' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-pc-linux-android" ./build.sh || exit 1 - -ANDROID_ABI_CMAKE=x86_64 ./extract.sh || exit 1 -ARCH='x86_64' ANDROID_ARCH='x86_64' ANDROID_ABI_CMAKE='x86_64' ANDROID_TARGET_ABI='' AUTOTOOLS_TARGET="$ARCH-pc-linux-android" ./build.sh || exit 1 diff --git a/test-android/build-scripts/build-call-cmake.sh b/test-android/build-scripts/build-call-cmake.sh deleted file mode 100755 index e1e8ae44d..000000000 --- a/test-android/build-scripts/build-call-cmake.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -source ./build-env.sh - -if [ -z "$parameters_installCommand" ] ; then -parameters_installCommand="make install" -fi - -if [ -z "$parameters_workDir" ] ; then -parameters_workDir=$DEV -fi - -source ./build-env.sh - - #set -ex - pushd $parameters_sourceDir - mkdir -p build_$ANDROID_ABI_CMAKE - pushd build_$ANDROID_ABI_CMAKE - - # Invoke cmake in the most correctest way I've could find while try and erroring: - # - # The biggest pain point is that CMake does not seem to respect our existing cross compilation CFLAGS and LDFLAGS. - # Hence we are passing them manually, once via Android flags and once for "Required" flags. The latter is necessary - # to let cmake correctly probe for any existing header, function, library, etc. - # Watch out: Sometimes the flags are passed as ;-limited list! - - - cmake -G "Unix Makefiles" \ - -DCMAKE_MAKE_PROGRAM=make \ - -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DANDROID_NATIVE_API_LEVEL=$ANDROID_API \ - -DANDROID_ABI=$ANDROID_ABI_CMAKE \ - -DANDROID_TOOLCHAIN=$CC \ - -DANDROID_NDK=$NDK \ - -DANDROID_COMPILER_FLAGS="${CFLAGS// /;}" \ - -DANDROID_LINKER_FLAGS="${LDFLAGS// /;}" \ - -DANDROID_STL="c++_shared" \ - -DCMAKE_REQUIRED_FLAGS="${CFLAGS}" \ - -DCMAKE_REQUIRED_LINK_OPTIONS="${LDFLAGS// /;}" \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DCMAKE_STAGING_PREFIX=${PREFIX} \ - -DBUILD_SHARED_LIBS=1 \ - $parameters_cmakeArgs .. - #-DCMAKE_VERBOSE_MAKEFILE=1 \ - make -j$((`nproc`+1)) || (popd && popd && exit 1) - $parameters_installCommand - popd - popd - diff --git a/test-android/build-scripts/build-env.sh b/test-android/build-scripts/build-env.sh deleted file mode 100755 index 2e59d84d4..000000000 --- a/test-android/build-scripts/build-env.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -export ICONV_VERSION=1.16 -# Use recent master libffi, because 3.3 is broken=checking host system type... Invalid configuration `arm-none-linux-eabi=machine `arm-none-linux not recognized -export FFI_VERSION=dd5bd03075149d7cf8441875c1a344e8beb57dde -export GETTEXT_VERSION=0.21 -#need to switch to meson build system to use a more recent version -export GLIB_VERSION=2.58 -export GLIB_EXTRAVERSION=3 -export OBOE_VERSION=1.5.0 -export SNDFILE_VERSION=1.0.31 -export INSTPATCH_VERSION=1.1.6 -export VORBIS_VERSION=1.3.7 -export OGG_VERSION=1.3.4 -export OPUS_VERSION=1.3.1 -# flac 1.3.3 is completely broken=pkgconfig is incorrectly installed, compilation failure, etc.; use recent master instead -export FLAC_VERSION=27c615706cedd252a206dd77e3910dfa395dcc49 - -export SCRIPTSDIR=$PWD -export DEV=$PWD/android-build-root/$ANDROID_ABI_CMAKE -export ARCHIVE_DIR=$PWD/archives -export DIST=$PWD/build-artifacts - -# This is a symlink pointing to the real Android NDK -# Must be the same as $ANDROID_NDK_HOME see: -# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md -if [ -z "$NDK" ]; then -export NDK=~/Android/Sdk/ndk/21.3.6528147 -fi - -# All the built binaries, libs and their headers will be installed here -export PREFIX=$DEV/opt/android - -# The path of standalone NDK toolchain -# Refer to https://developer.android.com/ndk/guides/standalone_toolchain.html -export NDK_TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/linux-x86_64/ - -# Dont mix up .pc files from your host and build target -export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig -# setting PKG_CONFIG_PATH alone does not seem to be enough to avoid mixing up with the host, also set PKG_CONFIG_LIBDIR -export PKG_CONFIG_LIBDIR=$PKG_CONFIG_PATH - -# Set Android target API level -# when compiling with clang use at least 28 as this makes sure that android provides the posix_spawn functions, so the compilation of gettext will (should) work out of the box -# its probably a bug of gettext, if posix_spawn is not available it replaces it with its own implementation. Autotools of gettext set HAVE_POSIX_SPAWN==0 (which is correct) but for some reason REPLACE_POSIX_SPAWN==0 (which is wrong, as it should be 1). -# -# NOTE=API 24 is required because it provides fseeko() and ftello() required by libflac -export ANDROID_API=24 - -# Tell configure what flags Android requires. -# Turn Wimplicit-function-declaration into errors. Else autotools will be fooled when checking for available functions (that in fact are NOT available) and compilation will fail later on. -# Also disable clangs integrated assembler, as the hand written assembly of libffi is not recognized by it, cf. https://crbug.com/801303 -export CFLAGS="-fPIE -fPIC -I$PREFIX/include --sysroot=$NDK_TOOLCHAIN/sysroot -I$NDK_TOOLCHAIN/sysroot/usr/include -Werror=implicit-function-declaration" -export CXXFLAGS=$CFLAGS -export CPPFLAGS=$CXXFLAGS - -export ARTIFACT_NAME=fluidsynth-android$ANDROID_API diff --git a/test-android/build-scripts/build.sh b/test-android/build-scripts/build.sh deleted file mode 100755 index e4ff09fa4..000000000 --- a/test-android/build-scripts/build.sh +++ /dev/null @@ -1,275 +0,0 @@ -#!/bin/bash - - set -e - - source ./build-env.sh - -# set environment variables - - # The cross-compile toolchain we use - export ANDROID_TARGET=$ARCH-linux-android$ANDROID_TARGET_ABI - #echo "##vso[task.setvariable variable=ANDROID_TARGET]$ANDROID_TARGET" - export ANDROID_TARGET_API=$ANDROID_ARCH-linux-android$ANDROID_TARGET_ABI$ANDROID_API - #echo "##vso[task.setvariable variable=ANDROID_TARGET_API]$ANDROID_TARGET_API" - # Add the standalone toolchain to the search path. - # FIXME: env. path should be at last; it depends on host glib tools to build some tests. - export PATH=$PATH:$PREFIX/bin:$PREFIX/lib:$PREFIX/include:$NDK_TOOLCHAIN/bin - #echo "##vso[task.setvariable variable=PATH]$PATH" - - export LIBPATH0=$PREFIX/lib - export LIBPATH1=$NDK_TOOLCHAIN/sysroot/usr/lib - export LIBPATH2=$NDK_TOOLCHAIN/sysroot/usr/lib/$ARCH-linux-android$ANDROID_TARGET_ABI/$ANDROID_API - export LIBPATH3=$NDK_TOOLCHAIN/sysroot/usr/lib/$ARCH-linux-android$ANDROID_TARGET_ABI - export LDFLAGS="-pie -Wl,-rpath-link=$LIBPATH1 -L$LIBPATH1 -Wl,-rpath-link=$LIBPATH2 -L$LIBPATH2 -Wl,-rpath-link=$LIBPATH3 -L$LIBPATH3 -Wl,-rpath-link=$LIBPATH0 -L$LIBPATH0" - #echo "##vso[task.setvariable variable=LDFLAGS]$LDFLAGS" - # Tell configure what tools to use. - export AR=$ANDROID_TARGET-ar - #echo "##vso[task.setvariable variable=AR]$AR" - export AS=$ANDROID_TARGET_API-clang - #echo "##vso[task.setvariable variable=AS]$AS" - export CC=$ANDROID_TARGET_API-clang - #echo "##vso[task.setvariable variable=CC]$CC" - export CXX=$ANDROID_TARGET_API-clang++ - #echo "##vso[task.setvariable variable=CXX]$CXX" - export LD=ld.lld - #echo "##vso[task.setvariable variable=LD]$LD" - export STRIP=$ANDROID_TARGET-strip - #echo "##vso[task.setvariable variable=STRIP]$STRIP" - export RANLIB=$ANDROID_TARGET-ranlib - #echo "##vso[task.setvariable variable=RANLIB]$RANLIB" - - -# libiconv - - echo "Building libiconv..." - - pushd $DEV/libiconv-$ICONV_VERSION - ./configure \ - --host=$AUTOTOOLS_TARGET \ - --prefix=$PREFIX \ - --libdir=$LIBPATH0 \ - --disable-rpath \ - --enable-static \ - --disable-shared \ - --with-pic \ - --disable-maintainer-mode \ - --disable-silent-rules \ - --disable-gtk-doc \ - --disable-introspection \ - --disable-nls - make -j$((`nproc`+1)) || exit 1 - make install || exit 1 - popd - -# libffi - - echo "Building libffi..." - - pushd $DEV/libffi-$FFI_VERSION - NOCONFIGURE=true autoreconf -v -i - # install headers into the conventional ${PREFIX}/include rather than ${PREFIX}/lib/libffi-3.2.1/include. - #sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' -i include/Makefile.in - #sed -e '/^includedir/ s/=.*$/=@includedir@/' -e 's/^Cflags: -I${includedir}/Cflags:/' -i libffi.pc.in - LDFLAGS="$LDFLAGS -Wl,-soname,libffi.so" ./configure --host=$AUTOTOOLS_TARGET --prefix=$PREFIX --enable-static --disable-shared --libdir=$LIBPATH0 - make -j$((`nproc`+1)) || exit 1 - make install || exit 1 - popd - -# gettext - - echo "Building gettext..." - - set -ex - pushd $DEV/gettext-$GETTEXT_VERSION - ./configure \ - --host=x86_64-pc-linux \ - --target=$AUTOTOOLS_TARGET \ - --prefix=$PREFIX \ - --libdir=$LIBPATH0 \ - --disable-rpath \ - --disable-libasprintf \ - --disable-java \ - --disable-native-java \ - --disable-openmp \ - --disable-curses \ - --enable-static \ - --disable-shared \ - --with-pic \ - --disable-maintainer-mode \ - --disable-silent-rules \ - --disable-gtk-doc \ - --disable-introspection - make -j$((`nproc`+1)) - make install - popd - -# glib - - echo "Building glib..." - - set -ex - pushd $DEV/glib-$GLIB_VERSION.$GLIB_EXTRAVERSION - cat << EOF > android.cache -glib_cv_long_long_format=ll -glib_cv_stack_grows=no -glib_cv_sane_realloc=yes -glib_cv_have_strlcpy=no -glib_cv_va_val_copy=yes -glib_cv_rtldglobal_broken=no -glib_cv_uscore=no -glib_cv_monotonic_clock=no -ac_cv_func_nonposix_getpwuid_r=no -ac_cv_func_posix_getpwuid_r=no -ac_cv_func_posix_getgrgid_r=no -glib_cv_use_pid_surrogate=yes -ac_cv_func_printf_unix98=no -ac_cv_func_vsnprintf_c99=yes -ac_cv_func_realloc_0_nonnull=yes -ac_cv_func_realloc_works=yes -EOF - # Unfortunately, libffi is not linked against libgobject when compiling for aarch64, leading to the following error: - # - # /bin/bash ../libtool --tag=CC --mode=link aarch64-linux-android23-clang -Wall -Wstrict-prototypes -Wno-bad-function-cast -Werror=declaration-after-statement -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format=2 -Werror=missing-include-dirs -fPIE -fPIC -I/home/vsts/work/1/s/android-build-root/opt/android/include --sysroot=/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot -I/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/include -Werror=implicit-function-declaration -fno-integrated-as -fno-strict-aliasing -pie -Wl,-rpath-link=-I/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/usr/lib -L/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/usr/lib -L/home/vsts/work/1/s/android-build-root/opt/android/lib -L/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//lib -o gobject-query gobject-query.o ./libgobject-2.0.la ../glib/libglib-2.0.la -lintl -liconv - # libtool: link: aarch64-linux-android23-clang -Wall -Wstrict-prototypes -Wno-bad-function-cast -Werror=declaration-after-statement -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format=2 -Werror=missing-include-dirs -fPIE -fPIC -I/home/vsts/work/1/s/android-build-root/opt/android/include --sysroot=/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot -I/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/include -Werror=implicit-function-declaration -fno-integrated-as -fno-strict-aliasing -pie -Wl,-rpath-link=-I/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/usr/lib -o .libs/gobject-query gobject-query.o -L/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/usr/lib -L/home/vsts/work/1/s/android-build-root/opt/android/lib -L/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//lib ./.libs/libgobject-2.0.so ../glib/.libs/libglib-2.0.so /home/vsts/work/1/s/android-build-root/opt/android/lib/libintl.so /home/vsts/work/1/s/android-build-root/opt/android/lib/libiconv.so -pthread -L/home/vsts/work/1/s/android-build-root/opt/android/lib - # /usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//bin/../lib/gcc/aarch64-linux-android/4.9.x/../../../../aarch64-linux-android/bin/ld: warning: libffi.so, needed by ./.libs/libgobject-2.0.so, not found (try using -rpath or -rpath-link) - # ./.libs/libgobject-2.0.so: undefined reference to `ffi_type_sint32@LIBFFI_BASE_8.0' - # ./.libs/libgobject-2.0.so: undefined reference to `ffi_prep_cif@LIBFFI_BASE_8.0' - # - # So, just add it to LDFLAGS to make sure it's always linked. - # libz.so is also missing... - #if [ "$ARCH" == "aarch64" ] ; then - #FFILIB=`pkg-config --libs libffi` - #echo $FFILIB - #export LDFLAGS="$LDFLAGS $FFILIB -lz" - #unset FFILIB ; - #fi - - chmod a-x android.cache - NOCONFIGURE=true ./autogen.sh - ./configure \ - --host=$ANDROID_TARGET \ - --prefix=$PREFIX \ - --libdir=$LIBPATH0 \ - --disable-dependency-tracking \ - --cache-file=android.cache \ - --enable-included-printf \ - --with-pcre=no \ - --enable-libmount=no \ - --enable-xattr=no \ - --with-libiconv=gnu \ - --disable-static \ - --enable-shared \ - --with-pic \ - --disable-maintainer-mode \ - --disable-silent-rules - make -j$((`nproc`+1)) || exit 1 - make install || exit 1 - popd - - -# ogg - - echo "Building libogg..." - - parameters_cmakeArgs="-DINSTALL_DOCS=0" parameters_sourceDir=$DEV/libogg-$OGG_VERSION parameters_workDir= parameters_condition= parameters_installCommand= bash ./build-call-cmake.sh - ls -la $DEV/libogg-$OGG_VERSION/build_$ANDROID_ABI_CMAKE/CMakeFiles/ || exit 1 - -# vorbis - - echo "Building libvorbis..." - - parameters_cmakeArgs= parameters_sourceDir=$DEV/libvorbis-$VORBIS_VERSION parameters_workDir= parameters_condition= parameters_installCommand= bash ./build-call-cmake.sh - ls -la $DEV/libvorbis-$VORBIS_VERSION/build_$ANDROID_ABI_CMAKE/CMakeFiles/ || exit 1 - -# flac - - echo "Building libFLAC..." - - parameters_cmakeArgs="-DCMAKE_C_STANDARD=99 -DCMAKE_C_STANDARD_REQUIRED=1 -DWITH_ASM=0 -DBUILD_CXXLIBS=0 -DBUILD_PROGRAMS=0 -DBUILD_EXAMPLES=0 -DBUILD_DOCS=0 -DINSTALL_MANPAGES=0" parameters_sourceDir=$DEV/flac-$FLAC_VERSION parameters_workDir= parameters_condition= parameters_installCommand= bash ./build-call-cmake.sh - ls -la $DEV/flac-$FLAC_VERSION/build_$ANDROID_ABI_CMAKE/CMakeFiles/ || exit 1 - -# opus - - echo "Building libopus..." - - parameters_cmakeArgs="-DBUILD_PROGRAMS=0 -DOPUS_MAY_HAVE_NEON=1 -DCMAKE_C_STANDARD=99 -DCMAKE_C_STANDARD_REQUIRED=1" parameters_sourceDir=$DEV/opus-$OPUS_VERSION parameters_workDir= parameters_condition= parameters_installCommand= bash ./build-call-cmake.sh - ls -la $DEV/opus-${OPUS_VERSION}/build_$ANDROID_ABI_CMAKE/CMakeFiles/ || exit 1 - - -# sndfile - - echo "Building libsndfile..." - - parameters_cmakeArgs="-DBUILD_PROGRAMS=0 -DBUILD_EXAMPLES=0" parameters_sourceDir=$DEV/libsndfile-$SNDFILE_VERSION parameters_workDir= parameters_condition= parameters_installCommand= bash ./build-call-cmake.sh - ls -la $DEV/libsndfile-$SNDFILE_VERSION/build_$ANDROID_ABI_CMAKE/CMakeFiles/ || exit 1 - -# oboe - - echo "Building oboe..." - - parameters_cmakeArgs= parameters_sourceDir=$DEV/oboe-$OBOE_VERSION parameters_workDir= parameters_condition= parameters_installCommand= bash ./build-call-cmake.sh || exit 1 - # parameters_installCommand didn't work, ending up to copy liboboe.so into $PREFIX/include. Replacing it with the direct commands here. - cp $DEV/oboe-$OBOE_VERSION/build_$ANDROID_ABI_CMAKE/liboboe.so $PREFIX/lib - cp -ur $DEV/oboe-$OBOE_VERSION/include/oboe $PREFIX/include - - set -ex - # create a custom pkgconfig file for oboe to allow fluidsynth to find it - cat << EOF > $PKG_CONFIG_PATH/oboe-1.0.pc -prefix=${PREFIX} -exec_prefix=\${prefix} -libdir=\${prefix}/lib -includedir=\${prefix}/include -Name: Oboe -Description: Oboe library -Version: ${OBOE_VERSION} -Libs: -L\${libdir} -loboe -landroid -llog -Cflags: -I\${includedir} -EOF - cat $PKG_CONFIG_PATH/oboe-1.0.pc || exit 1 - -# instpatch - - echo "Building libinstpatch..." - - parameters_cmakeArgs= parameters_sourceDir=$DEV/libinstpatch-$INSTPATCH_VERSION parameters_workDir= parameters_condition= parameters_installCommand= bash ./build-call-cmake.sh || exit 1 - -# fluidsynth - - # build - echo "Building fluidsynth..." - - # FIXME: On arm64 it fails to build fluidsynth executable due to a bunch of library resolution failures... - # To avoid the entire build failures, we ignore the - # exit code here and go on with fake executable file. - # It is not runnable on Android anyways. - parameters_cmakeArgs="-Denable-opensles=1 -Denable-floats=1 -Denable-oboe=1 -Denable-dbus=0 -Denable-oss=0" parameters_sourceDir=../.. parameters_workDir= parameters_condition= parameters_installCommand='echo success' bash ./build-call-cmake.sh || echo "Failed to build fluidsynth, but it is expected. We continue build..." && touch ../../build_$ANDROID_ABI_CMAKE/src/fluidsynth - - # TBD: test (there should be a complete Android project that installs apk, launches on android device, loads native tests there through JNI as a library, and run them, automatically.) - - # install - set -ex - pushd ../../build_$ANDROID_ABI_CMAKE - make install - popd - -# fluidsynth-assetloader - - echo "Building fluidsynth-assetloader..." - - parameters_cmakeArgs= parameters_sourceDir=../../../ parameters_workDir=doc/android/fluidsynth-assetloader parameters_condition= parameters_installCommand= bash ./build-call-cmake.sh - -# dist - - mkdir -p $DIST/lib/$ANDROID_ABI_CMAKE - echo "Entering $DIST/lib/$ANDROID_ABI_CMAKE ..." - pushd $DIST/lib/$ANDROID_ABI_CMAKE - cp -LR $PREFIX/lib/* . - ls -Rg . - rm -rf *.dll *.alias gettext/ libtextstyle.* *.a *.la - rm -f *.so.* - mkdir -p $DIST/include - pushd $DIST/include - cp -a $PREFIX/include/fluidsynth* . - popd - popd - echo "dist $ANDROID_ABI_CMAKE done." diff --git a/test-android/build-scripts/download.sh b/test-android/build-scripts/download.sh deleted file mode 100755 index 3acaefb36..000000000 --- a/test-android/build-scripts/download.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -source ./build-env.sh - - mkdir -p archives - wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz - wget -O libffi-${FFI_VERSION}.tar.gz https://github.com/libffi/libffi/archive/${FFI_VERSION}.tar.gz - wget http://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz - wget http://ftp.gnome.org/pub/gnome/sources/glib/${GLIB_VERSION}/glib-${GLIB_VERSION}.${GLIB_EXTRAVERSION}.tar.xz - wget -O oboe-${OBOE_VERSION}.tar.gz https://github.com/google/oboe/archive/${OBOE_VERSION}.tar.gz - wget https://github.com/libsndfile/libsndfile/releases/download/${SNDFILE_VERSION}/libsndfile-${SNDFILE_VERSION}.tar.bz2 - wget -O libinstpatch-${INSTPATCH_VERSION}.tar.gz https://github.com/swami/libinstpatch/archive/refs/tags/v${INSTPATCH_VERSION}.tar.gz - wget https://github.com/xiph/vorbis/releases/download/v${VORBIS_VERSION}/libvorbis-${VORBIS_VERSION}.tar.gz - wget https://github.com/xiph/ogg/releases/download/v${OGG_VERSION}/libogg-${OGG_VERSION}.tar.gz - wget -O flac-${FLAC_VERSION}.tar.gz https://github.com/xiph/flac/archive/${FLAC_VERSION}.tar.gz - wget -O opus-${OPUS_VERSION}.tar.gz https://github.com/xiph/opus/archive/refs/tags/v${OPUS_VERSION}.tar.gz - mv *.tar.gz *.tar.xz *.tar.bz2 $ARCHIVE_DIR diff --git a/test-android/build-scripts/extract.sh b/test-android/build-scripts/extract.sh deleted file mode 100755 index ede69218e..000000000 --- a/test-android/build-scripts/extract.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -source ./build-env.sh - -mkdir -p $DEV - -pushd $DEV - - tar zxf $ARCHIVE_DIR/libiconv-${ICONV_VERSION}.tar.gz - tar zxf $ARCHIVE_DIR/libffi-${FFI_VERSION}.tar.gz - tar zxf $ARCHIVE_DIR/gettext-${GETTEXT_VERSION}.tar.gz - tar xf $ARCHIVE_DIR/glib-${GLIB_VERSION}.${GLIB_EXTRAVERSION}.tar.xz - tar zxf $ARCHIVE_DIR/oboe-${OBOE_VERSION}.tar.gz - tar jxf $ARCHIVE_DIR/libsndfile-${SNDFILE_VERSION}.tar.bz2 - tar zxf $ARCHIVE_DIR/libinstpatch-${INSTPATCH_VERSION}.tar.gz - tar zxf $ARCHIVE_DIR/libvorbis-${VORBIS_VERSION}.tar.gz - tar zxf $ARCHIVE_DIR/libogg-${OGG_VERSION}.tar.gz - tar xf $ARCHIVE_DIR/flac-${FLAC_VERSION}.tar.gz - tar xf $ARCHIVE_DIR/opus-${OPUS_VERSION}.tar.gz - -popd diff --git a/test-android/build.gradle b/test-android/build.gradle deleted file mode 100644 index 319481698..000000000 --- a/test-android/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - ext.kotlin_version = "1.5.10" - repositories { - google() - mavenCentral() - } - dependencies { - classpath "com.android.tools.build:gradle:4.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/test-android/convert-tests.sh b/test-android/convert-tests.sh deleted file mode 100644 index a51c056c6..000000000 --- a/test-android/convert-tests.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -DISABLED_TESTS=(\ - preset_pinning \ - utf8_open \ - sf3_sfont_loading \ - sample_cache \ - sfont_loading \ - preset_sample_loading \ - sfont_unloading \ - sample_rate_change \ - bug_635 \ - ) - -rm -f test-names.txt -mkdir -p app/src/main/cpp/tests/ - -for f in `grep -lR "int main(void)" ../test/ | sort` ; do - export TESTMAINNAME=`echo $f | sed -e "s/\.\.\/test\/test_\(.*\).c$/\1/"` - echo $TESTMAINNAME >> test-names.txt - export OUTPUTFILE=app/src/main/cpp/tests/test_${TESTMAINNAME}.c - sed -e "s/int main(void)/int "$TESTMAINNAME"_main(void)/" $f > $OUTPUTFILE ; -done - -RUN_ALL_TESTS=app/src/main/cpp/run_all_tests.c - -rm -f $RUN_ALL_TESTS - -while IFS= read -r line; do - echo "int "$line"_main();" >> $RUN_ALL_TESTS ; -done < test-names.txt - -echo "int run_all_fluidsynth_tests() {" >> $RUN_ALL_TESTS -echo " int ret = 0; " >> $RUN_ALL_TESTS - -while IFS= read -r line; do - if [[ " ${DISABLED_TESTS[@]} " =~ " ${line} " ]]; then - echo " //ret += "$line"_main();" >> $RUN_ALL_TESTS ; - else - echo " ret += "$line"_main();" >> $RUN_ALL_TESTS ; - fi -done < test-names.txt - -echo " return ret;" >> $RUN_ALL_TESTS -echo "}" >> $RUN_ALL_TESTS diff --git a/test-android/gradle.properties b/test-android/gradle.properties deleted file mode 100644 index 252175276..000000000 --- a/test-android/gradle.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file diff --git a/test-android/gradle/wrapper/gradle-wrapper.jar b/test-android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f6b961fd5..000000000 Binary files a/test-android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/test-android/gradle/wrapper/gradle-wrapper.properties b/test-android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 61286a755..000000000 --- a/test-android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Thu May 27 19:17:18 JST 2021 -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/test-android/gradlew b/test-android/gradlew deleted file mode 100755 index cccdd3d51..000000000 --- a/test-android/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/test-android/gradlew.bat b/test-android/gradlew.bat deleted file mode 100644 index e95643d6a..000000000 --- a/test-android/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/test-android/settings.gradle b/test-android/settings.gradle deleted file mode 100644 index a5487531b..000000000 --- a/test-android/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = "fluidsynth-tests" -include ':app' diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 61e115cf2..e468533ef 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,7 +3,17 @@ ENABLE_TESTING() include ( FluidUnitTest ) # first define the test target, used by the macros below -add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -C $ --output-on-failure) +if( NOT ANDROID ) + add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -C $ --output-on-failure) +else() + # skip ctest on android, execution must be done via android emulator + add_custom_target(check) +endif() + +# stage the unit test data files (see TEST_DATA_FILES in the top-level +# CMakeLists.txt) into ${CMAKE_BINARY_DIR}/test so the tests can access them +# via relative paths +add_dependencies(check test_data) ## add unit tests here ## diff --git a/test/run-android-tests.sh b/test/run-android-tests.sh new file mode 100755 index 000000000..a5fefbacc --- /dev/null +++ b/test/run-android-tests.sh @@ -0,0 +1,245 @@ +#!/bin/bash + +# Android Emulator Test Runner +# This script runs individual FluidSynth test executables in the Android emulator +# Replaces the Gradle-based approach with direct ADB execution + +set -e + +# Configuration +ANDROID_ABI_CMAKE="${ANDROID_ABI_CMAKE:-arm64-v8a}" +ANDROID_API="${ANDROID_API:-24}" +BUILD_DIR="${BUILD_DIR:-build_${ANDROID_ABI_CMAKE}}" +TEST_DIR="/data/local/tmp/fluidsynth_tests" +RESULTS_FILE="/data/local/tmp/test_results.txt" + +# Colors for output +RED='\033[0;31m' +GREEN='\033[0;32m' +YELLOW='\033[1;33m' +NC='\033[0m' # No Color + +# Function to print colored output +print_status() { + echo -e "${GREEN}[INFO]${NC} $1" +} + +print_warning() { + echo -e "${YELLOW}[WARN]${NC} $1" +} + +print_error() { + echo -e "${RED}[ERROR]${NC} $1" +} + +# Function to cleanup on exit +cleanup() { + if [[ -n "$emulator_pid" ]] && ps -p "$emulator_pid" > /dev/null 2>&1; then + print_status "Cleaning up emulator process..." + kill -9 "$emulator_pid" 2>/dev/null || true + fi +} + +# Set up cleanup trap +trap cleanup EXIT + +# Check if ADB is available +if ! command -v adb &> /dev/null; then + print_error "ADB command not found. Please ensure Android SDK is installed and ADB is in PATH." + exit 1 +fi + +# Wait for device with timeout +print_status "Waiting for Android device/emulator..." +timeout 60 adb wait-for-device || { + print_error "Timeout waiting for device/emulator" + exit 1 +} + +# Check if device is ready +if ! adb shell echo "Device ready" &> /dev/null; then + print_error "Device not accessible via ADB" + exit 1 +fi + +print_status "Device ready" + +# Get device info for debugging +print_status "Device information:" +adb shell "uname -a" 2>/dev/null || print_warning "Could not get kernel info" +DEVICE_ABI=$(adb shell "getprop ro.product.cpu.abi" 2>/dev/null | tr -d '\r\n' || echo "unknown") +print_status "Device ABI: $DEVICE_ABI" + +# Warn if ABI mismatch +if [[ "$DEVICE_ABI" != "$ANDROID_ABI_CMAKE" ]] && [[ "$DEVICE_ABI" != "unknown" ]]; then + print_warning "ABI mismatch: building for $ANDROID_ABI_CMAKE but device is $DEVICE_ABI" +fi + +# Create test directory on device +print_status "Creating test directory on device: ${TEST_DIR}" +adb shell "mkdir -p ${TEST_DIR}" || true + +# Find all test executables +TEST_EXECUTABLES=$(find "${BUILD_DIR}/test" -maxdepth 1 -name "test_*" -type f -executable 2>/dev/null || true) + +if [[ -z "$TEST_EXECUTABLES" ]]; then + print_error "No Android test executables found in ${BUILD_DIR}/test" + print_error "Make sure to build the tests first with: make check" + print_error "Available files in build dir:" + ls -la "${BUILD_DIR}" | head -10 || true + exit 1 +fi + +print_status "Found $(echo "$TEST_EXECUTABLES" | wc -l) test executables" + +# Push test executables to device +print_status "Pushing test executables to device..." +for test_exe in $TEST_EXECUTABLES; do + test_name=$(basename "$test_exe") + print_status " Pushing $test_name" + if ! adb push "$test_exe" "${TEST_DIR}/${test_name}"; then + print_warning "Failed to push $test_name, skipping..." + continue + fi + adb shell "chmod 755 ${TEST_DIR}/${test_name}" +done + +# Also need to push required shared libraries if they exist +LIB_DIR="${PREFIX}/lib" + +# Push libc++_shared.so from the NDK toolchain sysroot. The test executables are built with +# ANDROID_STL=c++_shared (see cmake-android.yml), so they dynamically link against this runtime. +# It does NOT live in ${PREFIX}/lib (it's part of the NDK, not a fluidsynth dependency), so the +# loop below never picks it up. Without it, every test aborts with: +# CANNOT LINK EXECUTABLE "...": library "libc++_shared.so" not found +if [[ -n "$NDK" ]]; then + LIBCXX_SHARED="${NDK_TOOLCHAIN}/sysroot/usr/lib/${ARCH}-linux-android${ANDROID_TARGET_ABI}/libc++_shared.so" + if [[ -f "$LIBCXX_SHARED" ]]; then + adb shell "mkdir -p ${TEST_DIR}/lib" || true + print_status " Pushing libc++_shared.so" + adb push "$LIBCXX_SHARED" "${TEST_DIR}/lib/" || print_warning "Failed to push libc++_shared.so" + else + print_warning "libc++_shared.so not found (looked in ${LIBCXX_SHARED}); tests will likely fail to link" + fi +else + print_warning "NDK environment variable not set; cannot locate libc++_shared.so" +fi + +if [[ -d "$LIB_DIR" ]]; then + print_status "Pushing shared libraries to device..." + # Create lib directory on device + adb shell "mkdir -p ${TEST_DIR}/lib" || true + + # Push essential libraries (only the ones that exist) + # Order matters for dependencies + for lib in \ + libogg.so \ + libvorbis.so \ + libvorbisenc.so \ + libFLAC.so \ + libsndfile.so \ + liboboe.so \ + libfluidsynth.so; do + if [[ -f "${LIB_DIR}/${lib}" ]]; then + print_status " Pushing $lib" + adb push "${LIB_DIR}/${lib}" "${TEST_DIR}/lib/" || print_warning "Failed to push $lib" + fi + done + + # Verify libraries are available + adb shell "ls -la ${TEST_DIR}/lib/" 2>/dev/null | head -5 || true +else + print_warning "Library directory ${LIB_DIR} not found - tests may fail if they need shared libraries" +fi + +# Push the staged test data. CMake stages the unit test data files into +# ${CMAKE_BINARY_DIR}/test (see TEST_DATA_FILES in the top-level CMakeLists.txt), +# mirroring their location relative to the source root (sf2/, test/). +# The unit tests resolve the TEST_* macros (soundfont, DLS, MIDI, WAV paths) +# relative to their current working directory, which is ${TEST_DIR} on the +# device, so the pushed tree must keep exactly that layout. +TEST_DATA_STAGE="${BUILD_DIR}/test" +if [[ -d "$TEST_DATA_STAGE" ]]; then + print_status "Pushing staged test data from ${TEST_DATA_STAGE} to ${TEST_DIR} ..." + for sub in sf2 test; do + if ! adb push "${TEST_DATA_STAGE}/${sub}" "${TEST_DIR}"; then + print_warning "Failed to push test data directory ${sub}" + fi + adb shell "ls -la ${TEST_DIR}/${sub}" | head -10 || true + done +else + print_warning "Staged test data not found in ${TEST_DATA_STAGE} - tests that need soundfont/DLS/MIDI files will fail." + print_warning "Make sure the build was completed first (it builds the 'test_data' target via the 'check' target)." +fi + +# Initialize results +adb shell "echo 'FluidSynth Test Results' > ${RESULTS_FILE}" +adb shell "echo '======================' >> ${RESULTS_FILE}" +adb shell "echo 'Date: '$(date) >> ${RESULTS_FILE}" +adb shell "echo 'Architecture: ${ANDROID_ABI_CMAKE}' >> ${RESULTS_FILE}" +adb shell "echo 'Device ABI: ${DEVICE_ABI}' >> ${RESULTS_FILE}" +adb shell "echo '' >> ${RESULTS_FILE}" + +# Run tests +print_status "Running tests..." +total_tests=0 +passed_tests=0 +failed_tests=0 + +for test_exe in $TEST_EXECUTABLES; do + test_name=$(basename "$test_exe") + print_status "Running $test_name" + + total_tests=$((total_tests + 1)) + + # Set library path and run test + # Use a more robust library path setup + test_command="cd ${TEST_DIR} && export LD_LIBRARY_PATH=${TEST_DIR}/lib:/system/lib64:/system/lib:/vendor/lib64:/vendor/lib && ./${test_name}" + + # Run the test and capture exit code properly + if adb shell "$test_command" >/dev/null 2>&1; then + print_status " ✓ $test_name PASSED" + adb shell "echo '[PASS] $test_name' >> ${RESULTS_FILE}" + passed_tests=$((passed_tests + 1)) + else + print_error " ✗ $test_name FAILED" + # Try to get more detailed error info + error_output=$(adb shell "$test_command" 2>&1 | head -3 || echo "Unknown error") + print_error " Error: $error_output" + adb shell "echo '[FAIL] $test_name - $error_output' >> ${RESULTS_FILE}" + failed_tests=$((failed_tests + 1)) + fi +done + +# Write summary +adb shell "echo '' >> ${RESULTS_FILE}" +adb shell "echo 'Summary:' >> ${RESULTS_FILE}" +adb shell "echo 'Total tests: ${total_tests}' >> ${RESULTS_FILE}" +adb shell "echo 'Passed: ${passed_tests}' >> ${RESULTS_FILE}" +adb shell "echo 'Failed: ${failed_tests}' >> ${RESULTS_FILE}" + +# Pull results file +print_status "Retrieving test results..." +adb pull "${RESULTS_FILE}" "./android_test_results.txt" || print_warning "Could not retrieve results file" + +# Display summary +echo "" +print_status "Test Summary:" +echo "Total tests: $total_tests" +echo "Passed: $passed_tests" +echo "Failed: $failed_tests" + +# Display results file if available +if [[ -f "./android_test_results.txt" ]]; then + echo "" + print_status "Detailed results:" + cat "./android_test_results.txt" +fi + +if [[ $failed_tests -eq 0 ]]; then + print_status "All tests passed! ✓" + exit 0 +else + print_error "$failed_tests test(s) failed!" + exit 1 +fi \ No newline at end of file