summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-11-23 17:23:07 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-11-24 12:19:00 +0000
commit269859799481acec13e35bb6fb97458756e4991a (patch)
treecb3098036089fa0a9eefb6a9f9705031e3bc2eb3 /test
parent4f32b0815ee784ba2d91987c92f5d327b29c21bf (diff)
test: Convert to pragma once
Remove the verbose #ifndef/#define/#endif pattern for maintaining header idempotency, and replace it with a simple #pragma once. This simplifies the headers, and prevents redundant changes when header files get moved. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Diffstat (limited to 'test')
-rw-r--r--test/gstreamer/gstreamer_test.h5
-rw-r--r--test/libtest/buffer_source.h6
-rw-r--r--test/libtest/camera_test.h6
-rw-r--r--test/libtest/test.h6
-rw-r--r--test/media_device/media_device_test.h6
-rw-r--r--test/serialization/serialization_test.h6
-rw-r--r--test/v4l2_subdevice/v4l2_subdevice_test.h5
-rw-r--r--test/v4l2_videodevice/v4l2_videodevice_test.h6
8 files changed, 14 insertions, 32 deletions
diff --git a/test/gstreamer/gstreamer_test.h b/test/gstreamer/gstreamer_test.h
index ccfe0b92..9869d252 100644
--- a/test/gstreamer/gstreamer_test.h
+++ b/test/gstreamer/gstreamer_test.h
@@ -5,8 +5,7 @@
* gstreamer_test.cpp - GStreamer test base class
*/
-#ifndef __LIBCAMERA_GSTREAMER_TEST_H__
-#define __LIBCAMERA_GSTREAMER_TEST_H__
+#pragma once
#include <iostream>
#include <unistd.h>
@@ -33,5 +32,3 @@ protected:
GstElement *libcameraSrc_;
int status_;
};
-
-#endif /* __LIBCAMERA_GSTREAMER_TEST_H__ */
diff --git a/test/libtest/buffer_source.h b/test/libtest/buffer_source.h
index 84e2fa8f..0cc71aa5 100644
--- a/test/libtest/buffer_source.h
+++ b/test/libtest/buffer_source.h
@@ -4,8 +4,8 @@
*
* buffer_source.h - libcamera camera test helper to create FrameBuffers
*/
-#ifndef __LIBCAMERA_BUFFER_SOURCE_TEST_H__
-#define __LIBCAMERA_BUFFER_SOURCE_TEST_H__
+
+#pragma once
#include <libcamera/stream.h>
@@ -25,5 +25,3 @@ private:
std::shared_ptr<libcamera::MediaDevice> media_;
std::vector<std::unique_ptr<libcamera::FrameBuffer>> buffers_;
};
-
-#endif /* __LIBCAMERA_BUFFER_SOURCE_TEST_H__ */
diff --git a/test/libtest/camera_test.h b/test/libtest/camera_test.h
index 23122245..0b178bc2 100644
--- a/test/libtest/camera_test.h
+++ b/test/libtest/camera_test.h
@@ -4,8 +4,8 @@
*
* camera_test.h - libcamera camera test base class
*/
-#ifndef __LIBCAMERA_CAMERA_TEST_H__
-#define __LIBCAMERA_CAMERA_TEST_H__
+
+#pragma once
#include <memory>
@@ -23,5 +23,3 @@ protected:
std::shared_ptr<libcamera::Camera> camera_;
int status_;
};
-
-#endif /* __LIBCAMERA_CAMERA_TEST_H__ */
diff --git a/test/libtest/test.h b/test/libtest/test.h
index 8ecf2bda..ee01a225 100644
--- a/test/libtest/test.h
+++ b/test/libtest/test.h
@@ -4,8 +4,8 @@
*
* test.h - libcamera test base class
*/
-#ifndef __TEST_TEST_H__
-#define __TEST_TEST_H__
+
+#pragma once
#include <sstream>
@@ -34,5 +34,3 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char *argv[]) \
{ \
return klass().execute(); \
}
-
-#endif /* __TEST_TEST_H__ */
diff --git a/test/media_device/media_device_test.h b/test/media_device/media_device_test.h
index a88de56c..9b226f1a 100644
--- a/test/media_device/media_device_test.h
+++ b/test/media_device/media_device_test.h
@@ -4,8 +4,8 @@
*
* media_device_test.h - libcamera media device test base class
*/
-#ifndef __LIBCAMERA_MEDIADEVICE_TEST_H__
-#define __LIBCAMERA_MEDIADEVICE_TEST_H__
+
+#pragma once
#include <memory>
@@ -28,5 +28,3 @@ protected:
private:
std::unique_ptr<libcamera::DeviceEnumerator> enumerator_;
};
-
-#endif /* __LIBCAMERA_MEDIADEVICE_TEST_H__ */
diff --git a/test/serialization/serialization_test.h b/test/serialization/serialization_test.h
index d654c7bf..609f9fdf 100644
--- a/test/serialization/serialization_test.h
+++ b/test/serialization/serialization_test.h
@@ -4,8 +4,8 @@
*
* serialization_test.h - Base class for serialization tests
*/
-#ifndef __LIBCAMERA_SERIALIZATION_TEST_H__
-#define __LIBCAMERA_SERIALIZATION_TEST_H__
+
+#pragma once
#include <libcamera/camera.h>
#include <libcamera/camera_manager.h>
@@ -27,5 +27,3 @@ public:
static bool equals(const libcamera::ControlList &lhs,
const libcamera::ControlList &rhs);
};
-
-#endif /* __LIBCAMERA_SERIALIZATION_TEST_H__ */
diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h
index 83beb6a2..e73c583b 100644
--- a/test/v4l2_subdevice/v4l2_subdevice_test.h
+++ b/test/v4l2_subdevice/v4l2_subdevice_test.h
@@ -5,8 +5,7 @@
* v4l2_subdevice_test.h - VIMC-based V4L2 subdevice test
*/
-#ifndef __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__
-#define __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__
+#pragma once
#include <libcamera/framebuffer.h>
@@ -32,5 +31,3 @@ protected:
std::shared_ptr<libcamera::MediaDevice> media_;
libcamera::V4L2Subdevice *scaler_;
};
-
-#endif /* __LIBCAMERA_V4L2_SUBDEVICE_TEST_H__ */
diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h
index e7762294..d2de1a6d 100644
--- a/test/v4l2_videodevice/v4l2_videodevice_test.h
+++ b/test/v4l2_videodevice/v4l2_videodevice_test.h
@@ -4,8 +4,8 @@
*
* vl42device_test.h - libcamera v4l2device test base class
*/
-#ifndef __LIBCAMERA_V4L2_DEVICE_TEST_H_
-#define __LIBCAMERA_V4L2_DEVICE_TEST_H_
+
+#pragma once
#include <memory>
@@ -41,5 +41,3 @@ protected:
libcamera::V4L2VideoDevice *capture_;
std::vector<std::unique_ptr<libcamera::FrameBuffer>> buffers_;
};
-
-#endif /* __LIBCAMERA_V4L2_DEVICE_TEST_H_ */