test: logging: move logging tests to a subdirectory

Since there are two logging tests now, move them to their own
subdirectory. Update meson as necessary.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 0 insertions, 151 deletions

diff --git a/test/log.cpp b/test/log.cpp
deleted file mode 100644
index 33622f84..00000000
--- a/test/log.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2019, Google Inc.
- *
- * log.cpp - log API test
- */
-
-#include <algorithm>
-#include <fcntl.h>
-#include <iostream>
-#include <list>
-#include <sstream>
-#include <stdio.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <libcamera/logging.h>
-
-#include "log.h"
-#include "test.h"
-
-using namespace std;
-using namespace libcamera;
-
-LOG_DEFINE_CATEGORY(LogAPITest)
-
-class LogAPITest : public Test
-{
-protected:
-	void doLogging()
-	{
-		logSetLevel("LogAPITest", "DEBUG");
-		LOG(LogAPITest, Info) << "good 1";
-
-		logSetLevel("LogAPITest", "WARN");
-		LOG(LogAPITest, Info) << "bad";
-
-		logSetLevel("LogAPITest", "ERROR");
-		LOG(LogAPITest, Error) << "good 3";
-		LOG(LogAPITest, Info) << "bad";
-
-		logSetLevel("LogAPITest", "WARN");
-		LOG(LogAPITest, Warning) << "good 5";
-		LOG(LogAPITest, Info) << "bad";
-	}
-
-	int verifyOutput(istream &is)
-	{
-		list<int> goodList = { 1, 3, 5 };
-		string line;
-		while (getline(is, line)) {
-			if (goodList.empty()) {
-				cout << "Too many log lines" << endl;
-				return TestFail;
-			}
-
-			unsigned int digit = line.back() - '0';
-			unsigned int expect = goodList.front();
-			goodList.pop_front();
-			if (digit != expect) {
-				cout << "Incorrect log line" << endl;
-				return TestFail;
-			}
-		}
-
-		if (!goodList.empty()) {
-			cout << "Too few log lines" << endl;
-			return TestFail;
-		}
-
-		return TestPass;
-	}
-
-	int testFile()
-	{
-		int fd = open("/tmp", O_TMPFILE | O_RDWR, S_IRUSR | S_IWUSR);
-		if (fd < 0) {
-			cerr << "Failed to open tmp log file" << endl;
-			return TestFail;
-		}
-
-		char path[32];
-		snprintf(path, sizeof(path), "/proc/self/fd/%u", fd);
-
-		if (logSetFile(path) < 0) {
-			cerr << "Failed to set log file" << endl;
-			return TestFail;
-		}
-
-		doLogging();
-
-		char buf[1000];
-		memset(buf, 0, sizeof(buf));
-		lseek(fd, 0, SEEK_SET);
-		if (read(fd, buf, sizeof(buf)) < 0) {
-			cerr << "Failed to read tmp log file" << endl;
-			return TestFail;
-		}
-		close(fd);
-
-		istringstream iss(buf);
-		return verifyOutput(iss);
-	}
-
-	int testStream()
-	{
-		stringstream log;
-		/* Never fails, so no need to check return value */
-		logSetStream(&log);
-
-		doLogging();
-
-		return verifyOutput(log);
-	}
-
-	int testTarget()
-	{
-		logSetTarget(LoggingTargetNone);
-		logSetLevel("LogAPITest", "DEBUG");
-		LOG(LogAPITest, Info) << "don't crash please";
-
-		if (!logSetTarget(LoggingTargetFile))
-			return TestFail;
-
-		if (!logSetTarget(LoggingTargetStream))
-			return TestFail;
-
-		return TestPass;
-	}
-
-	int run() override
-	{
-		int ret = testFile();
-		if (ret != TestPass)
-			return TestFail;
-
-		ret = testStream();
-		if (ret != TestPass)
-			return TestFail;
-
-		ret = testTarget();
-		if (ret != TestPass)
-			return TestFail;
-
-		return TestPass;
-	}
-};
-
-TEST_REGISTER(LogAPITest)