Automate testing

.github/workflows/build.yml

@@ -50,8 +50,37 @@ jobs:
         with:
           name: build
           path: .build/package/build/rmall/src/release
+      - name: Save repo
+        uses: actions/upload-artifact@v3
+        with:
+          name: repo
+          path: .build/package/dist/rmall
+  test:
+    name: Test packages
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - uses: actions/download-artifact@v3
+        id: download
+        with:
+          name: repo
+      - uses: Eeems-Org/run-in-remarkable-action@v1
+        with:
+          setup: |
+            set -ex
+            echo "src/gz local-rmall file:///opt/tmp/src" > /opt/etc/opkg.conf.d/16-local.conf
+          run: |
+            set -ex
+            echo Y | toltecctl generate-opkg-conf
+            opkg update
+            opkg install oxide
+            # systemctl disable --now xochitl
+            # systemctl enable --now tarnish
+            # TODO install and run tests
+            opkg remove --force-removal-of-dependent-packages liboxide
+          path: ${{ steps.download.outputs.download-path }}
   release:
-    needs: build
+    needs: [build,test]
     if: ${{ github.ref == 'refs/heads/master' }}
     runs-on: ubuntu-latest
     steps:

Makefile

@@ -4,6 +4,8 @@ all: release
 
 .NOTPARALLEL:
 
+MAKEFLAGS := --jobs=$(shell nproc)
+
 # FEATURES += sentry
 
 DIST=$(CURDIR)/release
@@ -25,10 +27,10 @@ release: clean build $(RELOBJ)
 	mkdir -p $(DIST)
 	# Force liboxide makefile to regenerate so that install targets get when being build in toltecmk
 	cd $(BUILD)/oxide/shared/liboxide && make qmake
-	INSTALL_ROOT=$(DIST) $(MAKE) -C $(BUILD)/oxide install
+	INSTALL_ROOT=$(DIST) $(MAKE) --output-sync=target -C $(BUILD)/oxide install
 
 build: $(BUILD) $(OBJ)
-	$(MAKE) -C $(BUILD)/oxide all
+	$(MAKE) --output-sync=target -C $(BUILD)/oxide all
 
 package: REV="~r$(shell git rev-list --count HEAD).$(shell git rev-parse --short HEAD)"
 package:

applications/applications.pro

@@ -38,7 +38,7 @@ xdg-open.depends = system-service
 gio.depends = system-service
 xdg-settings.depends = system-service
 xdg-icon-resource.depends = system-service
-desktop-file-edit.depends = desktop-file-edit
+desktop-file-edit.depends =
 desktop-file-install.depends =
 inject_evdev.depends =
 

applications/launcher/appitem.cpp

@@ -61,3 +61,5 @@ Application* AppItem::getApp(){
     app = instance;
     return app;
 }
+
+#include "moc_appitem.cpp"

applications/launcher/controller.cpp

@@ -35,97 +35,97 @@
     auto configFile = getConfigFile();
     return configFile != nullptr && configFile->exists();
 }
 void Controller::loadSettings(){
     // If the config directory doesn't exist,
     // then print an error and stop.
     qDebug() << "parsing config file...";
     if(configFileExists()){
         auto configFile = getConfigFile();
         if (!configFile->open(QIODevice::ReadOnly | QIODevice::Text)) {
             qCritical() << "Couldn't read the config file. " << configFile->fileName();
             return;
         }
         QTextStream in(configFile);
         while (!in.atEnd()) {
             QString line = in.readLine();
             if(!line.startsWith("#") && !line.isEmpty()){
                 QStringList parts = line.split("=");
                 if(parts.length() != 2){
                     O_WARNING("  Wrong format on " << line);
                     continue;
                 }
                 QString lhs = parts.at(0).trimmed();
                 QString rhs = parts.at(1).trimmed();
                 if (booleanSettings.contains(lhs)){
                     auto property = lhs.toStdString();
                     auto value = rhs.toLower();
                     auto boolValue = value == "true" || value == "t" || value == "y" || value == "yes" || value == "1";
                     setProperty(property.c_str(), boolValue);
                     qDebug() << "  " << (property + ":").c_str() << boolValue;
                 }else if(settings.contains(lhs)){
                     auto property = lhs.toStdString();
                     setProperty(property.c_str(), rhs);
                     qDebug() << "  " << (property + ":").c_str() << rhs.toStdString().c_str();
                 }
             }
         }
         configFile->close();
     }
     qDebug() << "Finished parsing config file.";
     auto sleepAfter = systemApi->autoSleep();
     qDebug() << "Automatic sleep" << sleepAfter;
     setAutomaticSleep(sleepAfter);
     setSleepAfter(sleepAfter);
     auto lockOnSuspend = systemApi->lockOnSuspend();
     qDebug() << "Lock on suspend" << lockOnSuspend;
     setLockOnSuspend(lockOnSuspend);
     auto autoLock = systemApi->autoLock();
     qDebug() << "Automatic lock" << autoLock;
     setAutomaticLock(autoLock);
     setLockAfter(autoLock);
     for(short i = 1; i <= 4; i++){
         setSwipeLength(i, systemApi->getSwipeLength(i));
     }
     qDebug() << "Updating UI with settings from config file...";
     // Populate settings in UI
     QObject* columnsSpinBox = root->findChild<QObject*>("columnsSpinBox");
     if(!columnsSpinBox){
         qDebug() << "Can't find columnsSpinBox";
     }else{
         columnsSpinBox->setProperty("value", columns());
     }
     QObject* sleepAfterSpinBox = root->findChild<QObject*>("sleepAfterSpinBox");
     if(!sleepAfterSpinBox){
         qDebug() << "Can't find sleepAfterSpinBox";
     }else{
         sleepAfterSpinBox->setProperty("value", this->sleepAfter());
     }
     QObject* swipeLengthRightSpinBox = root->findChild<QObject*>("swipeLengthRightSpinBox");
     if(!swipeLengthRightSpinBox){
         qDebug() << "Can't find swipeLengthRightSpinBox";
     }else{
         swipeLengthRightSpinBox->setProperty("value", this->swipeLengthRight());
     }
     QObject* swipeLengthLeftSpinBox = root->findChild<QObject*>("swipeLengthLeftSpinBox");
     if(!swipeLengthLeftSpinBox){
         qDebug() << "Can't find swipeLengthLeftSpinBox";
     }else{
         swipeLengthLeftSpinBox->setProperty("value", this->swipeLengthLeft());
     }
     QObject* swipeLengthUpSpinBox = root->findChild<QObject*>("swipeLengthUpSpinBox");
     if(!swipeLengthUpSpinBox){
         qDebug() << "Can't find swipeLengthUpSpinBox";
     }else{
         swipeLengthUpSpinBox->setProperty("value", this->swipeLengthUp());
     }
     QObject* swipeLengthDownSpinBox = root->findChild<QObject*>("swipeLengthDownSpinBox");
     if(!swipeLengthDownSpinBox){
         qDebug() << "Can't find swipeLengthDownSpinBox";
     }else{
         swipeLengthDownSpinBox->setProperty("value", this->swipeLengthDown());
     }
     qDebug() << "Finished updating UI.";
 }
 void Controller::saveSettings(){
     qDebug() << "Saving configuration...";
     QSet<QString> items = settings;
@@ -299,7 +299,7 @@
 std::string Controller::exec(const char* cmd) {
     std::array<char, 128> buffer;
     std::string result;
     std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
     if (!pipe) {
         throw std::runtime_error("popen() failed!");
     }
@@ -415,3 +415,5 @@
     qDebug() << "Lock After: " << lockAfter << " minutes";
     emit lockAfterChanged(m_lockAfter);
 }
+
+#include "moc_controller.cpp"

applications/system-service/apibase.cpp

@@ -20,3 +20,5 @@ int APIBase::hasPermission(QString permission, const char* sender){
     qDebug() << "app not found, permission granted";
     return true;
 }
+
+#include "moc_apibase.cpp"

applications/system-service/application.cpp

@@ -52,7 +52,7 @@
             }
             updateEnvironment();
             umountAll();
             if(chroot()){
                 mountAll();
                 m_process->setChroot(chrootPath());
                 m_process->setWorkingDirectory(chrootPath() + "/" + workingDirectory());
@@ -554,3 +554,5 @@
     }
     span = Oxide::Sentry::start_span(transaction, operation, description);
 }
+
+#include "moc_application.cpp"

applications/system-service/appsapi.cpp

@@ -184,3 +184,5 @@ void AppsAPI::ensureForegroundApp() {
         }
     });
 }
+
+#include "moc_appsapi.cpp"

applications/system-service/bss.cpp

@@ -36,3 +36,5 @@ QDBusObjectPath BSS::network(){
 }
 
 bool BSS::hasPermission(QString permission, const char* sender){ return wifiAPI->hasPermission(permission,sender); }
+
+#include "moc_bss.cpp"

applications/system-service/buttonhandler.cpp

@@ -111,3 +111,5 @@ void ButtonHandler::pressKey(Qt::Key key){
     }
     press_button(buttons, code, &stream);
 }
+
+#include "moc_buttonhandler.cpp"

applications/system-service/network.cpp

@@ -71,3 +71,5 @@ QList<QDBusObjectPath> Network::bSSs(){
 }
 
 bool Network::hasPermission(QString permission, const char* sender){ return wifiAPI->hasPermission(permission, sender); }
+
+#include "moc_network.cpp"

applications/system-service/notification.cpp

@@ -99,3 +99,5 @@ void Notification::setIcon(QString icon){
 }
 
 bool Notification::hasPermission(QString permission, const char* sender){ return notificationAPI->hasPermission(permission, sender); }
+
+#include "moc_notification.cpp"

applications/system-service/screenapi.cpp

@@ -27,3 +27,5 @@ QDBusObjectPath ScreenAPI::screenshot(){
         return path;
     });
 }
+
+#include "moc_screenapi.cpp"

applications/system-service/screenshot.cpp

@@ -2,3 +2,5 @@
 #include"screenapi.h"
 
 bool Screenshot::hasPermission(QString permission, const char* sender){ return screenAPI->hasPermission(permission, sender); }
+
+#include "moc_screenshot.cpp"

applications/system-service/systemapi.cpp

@@ -260,3 +260,5 @@ void SystemAPI::toggleSwipes(){
     notification->setText(message);
     notification->display();
 }
+
+#include "moc_systemapi.cpp"

applications/system-service/wlan.cpp

@@ -56,7 +56,7 @@
 std::string Wlan::exec(QString cmd) {
     std::array<char, 128> buffer;
     std::string result;
     std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd.toStdString().c_str(), "r"), pclose);
     if (!pipe) {
         throw std::runtime_error("popen() failed!");
     }
@@ -65,3 +65,5 @@
     }
     return result;
 }
+
+#include "moc_wlan.cpp"

applications/system-service/wpa_supplicant.cpp

@@ -63,3 +63,4 @@ FiW1Wpa_supplicant1NetworkInterface::~FiW1Wpa_supplicant1NetworkInterface()
 {
 }
 
+#include "moc_wpa_supplicant.cpp"

applications/task-switcher/appitem.cpp

@@ -60,3 +60,5 @@ Application* AppItem::getApp(){
     app = instance;
     return app;
 }
+
+#include "moc_appitem.cpp"

shared/liboxide/eventfilter.cpp

@@ -152,3 +152,5 @@ namespace Oxide{
         return filtered;
     }
 }
+
+#include "moc_eventfilter.cpp"

shared/liboxide/liboxide.cpp

@@ -357,3 +357,5 @@ namespace Oxide {
     O_SETTINGS_PROPERTY_BODY(SharedSettings, QString, Lockscreen, onLogin)
     O_SETTINGS_PROPERTY_BODY(SharedSettings, QString, Lockscreen, onFailedLogin)
 }
+
+#include "moc_liboxide.cpp"

shared/liboxide/settingsfile.cpp

@@ -147,3 +147,5 @@ namespace Oxide {
         return property(propertyName.toStdString().c_str()).toString();
     }
 }
+
+#include "moc_settingsfile.cpp"

shared/liboxide/signalhandler.cpp

@@ -82,3 +82,5 @@ namespace Oxide {
         snUsr2->setEnabled(true);
     }
 }
+
+#include "moc_signalhandler.cpp"

shared/sentry/src/external/crashpad/Makefile

@@ -0,0 +1,36 @@
+SHELL := /bin/bash
+PATH := $(PWD)/../depot_tools:$(PATH)
+
+all:
+	echo 'Nothing to do' && exit 1
+
+build-with-gn:
+	gn gen out/Default
+	ninja -C out/Default
+.PHONY: build-with-gn
+
+build-with-cmake:
+	mkdir -p cmakebuild
+	cd cmakebuild; cmake ..
+	cmake --build cmakebuild --parallel
+.PHONY: build-with-cmake
+
+update-with-gclient:
+	gclient sync
+.PHONY: update-with-gclient
+
+example: build-with-gn
+	g++ -g \
+		-o example example.cpp \
+		-I. -I./third_party/mini_chromium/mini_chromium \
+		-std=c++14 \
+		-L./out/Default/obj/client -lclient \
+		-L./out/Default/obj/util -lutil \
+		-L./out/Default/obj/third_party/mini_chromium/mini_chromium/base -lbase \
+		-framework Foundation -framework Security -framework CoreText \
+		-framework CoreGraphics -framework IOKit -lbsm
+.PHONY: example
+
+gen-sentry-patch:
+	git format-patch --stdout master...HEAD > getsentry.patch
+.PHONY: get-sentry-patch

shared/sentry/src/external/crashpad/third_party/libfuzzer/BUILD.gn

@@ -0,0 +1,49 @@
+# Copyright 2018 The Crashpad Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source_set("libfuzzer") {
+  if (crashpad_use_libfuzzer) {
+    sources = [
+      "src/FuzzerClangCounters.cpp",
+      "src/FuzzerCrossOver.cpp",
+      "src/FuzzerDriver.cpp",
+      "src/FuzzerExtFunctionsDlsym.cpp",
+      "src/FuzzerExtFunctionsDlsymWin.cpp",
+      "src/FuzzerExtFunctionsWeak.cpp",
+      "src/FuzzerExtFunctionsWeakAlias.cpp",
+      "src/FuzzerExtraCounters.cpp",
+      "src/FuzzerIO.cpp",
+      "src/FuzzerIOPosix.cpp",
+      "src/FuzzerIOWindows.cpp",
+      "src/FuzzerLoop.cpp",
+      "src/FuzzerMain.cpp",
+      "src/FuzzerMerge.cpp",
+      "src/FuzzerMutate.cpp",
+      "src/FuzzerSHA1.cpp",
+      "src/FuzzerShmemPosix.cpp",
+      "src/FuzzerShmemWindows.cpp",
+      "src/FuzzerTracePC.cpp",
+      "src/FuzzerUtil.cpp",
+      "src/FuzzerUtilDarwin.cpp",
+      "src/FuzzerUtilLinux.cpp",
+      "src/FuzzerUtilPosix.cpp",
+      "src/FuzzerUtilWindows.cpp",
+    ]
+
+    configs -= [
+      "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
+      "//build:crashpad_fuzzer_flags",
+    ]
+  }
+}

web/src/index.rst

@@ -47,4 +47,4 @@ Uninstall Oxide
 
 1. ``systemctl disable --now tarnish``
 2. ``systemctl enable --now xochitl``
-3. ``opkg remove -force-removal-of-dependent-packages liboxide``
+3. ``opkg remove --force-removal-of-dependent-packages liboxide``