From 3a892e396803e0b53d8cee0e4b9f8c5c9b33b742 Mon Sep 17 00:00:00 2001 From: Determinant Date: Tue, 26 Jun 2018 19:27:26 -0400 Subject: ... --- test/.gitignore | 1 + test/Makefile | 180 ------------------------------------------------------ test/test_msg.cpp | 2 + 3 files changed, 3 insertions(+), 180 deletions(-) delete mode 100644 test/Makefile (limited to 'test') diff --git a/test/.gitignore b/test/.gitignore index 4cdad0d..b308815 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1 +1,2 @@ test_msg +Makefile diff --git a/test/Makefile b/test/Makefile deleted file mode 100644 index 173f653..0000000 --- a/test/Makefile +++ /dev/null @@ -1,180 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.11 - -# Default target executed when no arguments are given to make. -default_target: all - -.PHONY : default_target - -# Allow only one "make -f Makefile2" at a time, but pass parallelism. -.NOTPARALLEL: - - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canonical targets will work. -.SUFFIXES: - - -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = - -.SUFFIXES: .hpux_make_needs_suffix_list - - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - - -# A target that is always out of date. -cmake_force: - -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /usr/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/ymf/work/hot-stuff/code/salticidae - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/ymf/work/hot-stuff/code/salticidae - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : rebuild_cache - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache - -.PHONY : rebuild_cache/fast - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." - /usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : edit_cache - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache - -.PHONY : edit_cache/fast - -# The main all target -all: cmake_check_build_system - cd /home/ymf/work/hot-stuff/code/salticidae && $(CMAKE_COMMAND) -E cmake_progress_start /home/ymf/work/hot-stuff/code/salticidae/CMakeFiles /home/ymf/work/hot-stuff/code/salticidae/test/CMakeFiles/progress.marks - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f CMakeFiles/Makefile2 test/all - $(CMAKE_COMMAND) -E cmake_progress_start /home/ymf/work/hot-stuff/code/salticidae/CMakeFiles 0 -.PHONY : all - -# The main clean target -clean: - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f CMakeFiles/Makefile2 test/clean -.PHONY : clean - -# The main clean target -clean/fast: clean - -.PHONY : clean/fast - -# Prepare targets for installation. -preinstall: all - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f CMakeFiles/Makefile2 test/preinstall -.PHONY : preinstall - -# Prepare targets for installation. -preinstall/fast: - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f CMakeFiles/Makefile2 test/preinstall -.PHONY : preinstall/fast - -# clear depends -depend: - cd /home/ymf/work/hot-stuff/code/salticidae && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -.PHONY : depend - -# Convenience name for target. -test/CMakeFiles/test_msg.dir/rule: - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f CMakeFiles/Makefile2 test/CMakeFiles/test_msg.dir/rule -.PHONY : test/CMakeFiles/test_msg.dir/rule - -# Convenience name for target. -test_msg: test/CMakeFiles/test_msg.dir/rule - -.PHONY : test_msg - -# fast build rule for target. -test_msg/fast: - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f test/CMakeFiles/test_msg.dir/build.make test/CMakeFiles/test_msg.dir/build -.PHONY : test_msg/fast - -test_msg.o: test_msg.cpp.o - -.PHONY : test_msg.o - -# target to build an object file -test_msg.cpp.o: - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f test/CMakeFiles/test_msg.dir/build.make test/CMakeFiles/test_msg.dir/test_msg.cpp.o -.PHONY : test_msg.cpp.o - -test_msg.i: test_msg.cpp.i - -.PHONY : test_msg.i - -# target to preprocess a source file -test_msg.cpp.i: - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f test/CMakeFiles/test_msg.dir/build.make test/CMakeFiles/test_msg.dir/test_msg.cpp.i -.PHONY : test_msg.cpp.i - -test_msg.s: test_msg.cpp.s - -.PHONY : test_msg.s - -# target to generate assembly for a file -test_msg.cpp.s: - cd /home/ymf/work/hot-stuff/code/salticidae && $(MAKE) -f test/CMakeFiles/test_msg.dir/build.make test/CMakeFiles/test_msg.dir/test_msg.cpp.s -.PHONY : test_msg.cpp.s - -# Help Target -help: - @echo "The following are some of the valid targets for this Makefile:" - @echo "... all (the default if no target is provided)" - @echo "... clean" - @echo "... depend" - @echo "... rebuild_cache" - @echo "... test_msg" - @echo "... edit_cache" - @echo "... test_msg.o" - @echo "... test_msg.i" - @echo "... test_msg.s" -.PHONY : help - - - -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - cd /home/ymf/work/hot-stuff/code/salticidae && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -.PHONY : cmake_check_build_system - diff --git a/test/test_msg.cpp b/test/test_msg.cpp index 2d039e4..8b7528f 100644 --- a/test/test_msg.cpp +++ b/test/test_msg.cpp @@ -30,6 +30,8 @@ using salticidae::get_hash; using salticidae::get_hex; struct MsgTest: public salticidae::MsgBase<> { + using MsgBase::MsgBase; + void gen_testhashes(int cnt) { DataStream s; set_opcode(0x01); -- cgit v1.2.3