Merge branch 'support-4120-to_develop' into 'develop'

Support-4120

See merge request !790

CMakeLists.txt

@@ -6,12 +6,10 @@ set(CELLFRAME_SDK_NATIVE_VERSION "3.2-0")
 
 add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
 
-set(BUILD_CRYPTO_TESTS ON)
-
 set(DAPSDK_MODULES "")
 
 if(NOT DEFINED CELLFRAME_MODULES)
-    include (cmake/OS_Detection.cmake)       
+    include (cmake/OS_Detection.cmake)
     if(LINUX)
         set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-block-ton cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
     elseif(WIN32 OR BSD OR DARWIN OR ANDROID)
@@ -48,14 +46,44 @@ if (CELLFRAME_MODULES MATCHES "dap-sdk-net-client")
     endif()
 endif()
 
-if (BUILD_CRYPTO_TESTS)
-    if ( NOT(DAPSDK_MODULES MATCHES "core"))
-	SET(DAPSDK_MODULES "${DAPSDK_MODULES} core")
+if (BUILD_CELLFRAME_SDK_TESTS)
+    enable_testing()
+    set(CELLFRAME_MODULES ${CELLFRAME_MODULES} "test-framework")
+    if (NOT OFF_CORE_CELLFRAME_SDK_TESTS_OFF MATCHES "all")
+        set(BUILD_DAP_TESTS ON)
+        if ( NOT(DAPSDK_MODULES MATCHES "core"))
+            SET(DAPSDK_MODULES "${DAPSDK_MODULES} core")
+        endif()
+    endif()
+    if (OFF_CORE_CELLFRAME_SDK_TESTS_OFF MATCHES "network-monitor")
+        message("[-] network-monitor tests")
+        add_definitions("-DDAP_NETWORK_MONITOR_TEST_OFF")
+    endif()
+    if (NOT (OFF_CRYPTO_CELLFRAME_SDK_TESTS_OFF MATCHES "all"))
+        set(BUILD_CRYPTO_TESTS ON)
+    endif()
+    if (OFF_CRYPTO_CELLFRAME_SDK_TESTS_OFF MATCHES "new-hope")
+        message("[-] newhope tests")
+        add_definitions("-DDAP_CRYPTO_NEWHOPE_TEST_OFF")
     endif()
-    if ( NOT(DAPSDK_MODULES MATCHES "crypto"))
-	SET(DAPSDK_MODULES "${DAPSDK_MODULES} crypto")
+    if (OFF_CRYPTO_CELLFRAME_SDK_TESTS_OFF MATCHES "multisign")
+        message("[-] multisign tests")
+        add_definitions("-DDAP_CRYPTO_MULTISIGN_TEST_OFF")
     endif()
-    set(BUILD_TESTS ON)
+    if (BUILD_CRYPTO_TESTS)
+        if ( NOT(DAPSDK_MODULES MATCHES "core"))
+            SET(DAPSDK_MODULES "${DAPSDK_MODULES} core")
+        endif()
+        if ( NOT(DAPSDK_MODULES MATCHES "crypto"))
+            SET(DAPSDK_MODULES "${DAPSDK_MODULES} crypto")
+        endif()
+        set(BUILD_TESTS ON)
+    endif()
+endif()
+
+if (CELLFRAME_MODULES MATCHES "test-framework")
+    add_subdirectory(test-framework)
+    set(CELLFRAME_LIBS ${CELLFRAME_LIBS} dap_test)
 endif()
 
 if(BUILD_TESTS)

dap-sdk/core/test/CMakeLists.txt

@@ -5,7 +5,6 @@ project(core_test)
 set(CMAKE_C_STANDARD 11)
 file(GLOB SRCS *.c)
 
-add_subdirectory(libdap-test)
 
 if(UNIX)
     file(GLOB PLATROFM_DEP_SRC unix/*.c unix/*.h)
@@ -57,7 +56,7 @@ add_test(
 
 add_test(
     NAME rpm-test
-    COMMAND rpmalloc
+    COMMAND rpmalloc_test
 )
 
 if(UNIX)

dap-sdk/core/test/dap_strfuncs_test.h

 #pragma once
 #include "dap_test.h"
 #include "dap_strfuncs.h"
+#include "dap_time.h"
 
 extern void dap_strfuncs_tests_run(void);

dap-sdk/core/test/main.c

 #include "dap_config_test.h"
 #include "dap_common_test.h"
 #ifndef _WIN32
+#ifdef  DAP_OS_UNIX
+#include "dap_circular_test.h"
+#include "dap_process_mem_test.h"
+#include "dap_cpu_monitor_test.h"
+#ifndef DDAP_NETWORK_MONITOR_TEST_OFF
+#include "dap_network_monitor.h"
 #include "dap_network_monitor_test.h"
 #endif
+#endif
+#endif
 #include "dap_strfuncs_test.h"
 #include "dap_common.h"
 
@@ -13,14 +21,12 @@ int main(void) {
     dap_strfuncs_tests_run();
     dap_config_tests_run();
     dap_common_test_run();
-#ifdef __unix__
-#include "dap_process_mem_test.h"
-#include "dap_cpu_monitor_test.h"
-#include "dap_network_monitor.h"
-#include "dap_circular_test.h"
+#ifdef DAP_OS_UNIX
     dap_circular_test_run();
     dap_process_mem_test_run();
     dap_cpu_monitor_test_run();
+#ifndef DAP_NETWORK_MONITOR_TEST_OFF
     dap_network_monitor_test_run();
 #endif
+#endif
 }

dap-sdk/crypto/test/crypto/cellframe-sdk

-../../../../
\ No newline at end of file

dap-sdk/crypto/test/crypto/main.c

@@ -8,7 +8,9 @@
 #include "dap_enc_tesla_test.h"
 #include "dap_enc_dilithium_test.h"
 #include "dap_enc_ringct20_test.h"
+#ifndef DAP_CRYPTO_MULTISIGN_TEST_OFF
 #include "dap_enc_sign_multi_test.h"
+#endif
 #include "rand/dap_rand.h"
 
 #include "dap_common.h"
@@ -19,7 +21,10 @@ int main(void) {
     // switch off debug info from library
     dap_log_level_set(L_CRITICAL);
     const int test_numbers = 100;
+#ifndef DAP_CRYPTO_NEWHOPE_TEST_OFF
     dap_enc_newhope_tests_run(test_numbers);
+#endif
+
     test_encypt_decrypt(test_numbers, DAP_ENC_KEY_TYPE_SALSA2012, 32);
     test_encypt_decrypt_fast(test_numbers, DAP_ENC_KEY_TYPE_SALSA2012, 32);
     test_encypt_decrypt(test_numbers, DAP_ENC_KEY_TYPE_SEED_OFB, 32);
@@ -48,7 +53,9 @@ int main(void) {
     dap_enc_defeo_tests_run();
     dap_enc_tesla_tests_run();
 
+#ifndef DAP_CRYPTO_MULTISIGN_TEST_OFF
     dap_enc_multi_sign_tests_run();
+#endif
 
     dap_enc_ringct20_tests_run(100);
 }

dap-sdk/crypto/test/crypto/test

-../../../../../test/libdap-test
\ No newline at end of file

test-framework/.gitignore

+build

test-framework/.travis.yml

+sudo: required
+language: c
+compiler: gcc
+dist: xenial
+notifications:
+  email: false
+
+script:
+    - mkdir build
+    - cd build 
+    - cmake ../
+    - make
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test

test-framework/CMakeLists.txt

+cmake_minimum_required(VERSION 3.0)
+if(TARGET dap_test)
+    return() # The project has already been built.
+endif()
+project(dap_test)
+
+add_library(${PROJECT_NAME} STATIC dap_test.h dap_test.c dap_test_generator.h dap_test_generator.c)
+
+target_include_directories(dap_test INTERFACE .)

test-framework/README.md

+# libdap-test
+
+[![Build Status](https://travis-ci.com/kelvinblockchain/libdap-test.svg?branch=master)](https://travis-ci.com/kelvinblockchain/libdap-test)

test-framework/dap_test.c

+#include "dap_test.h"
+
+#include <sys/time.h>
+
+/*
+ How to use benchmark_xxx() functions:
+
+ void mytest_func()
+ {
+ // doing something ...
+ }
+
+ // Repeat mytest_func() 5 time
+ int dt = benchmark_test_time(mytest_func, 5);
+ // Display result, sample 'Encode and decode PASS. (4 msec.)'
+ benchmark_mgs_time("Encode and decode", dt);
+
+ // Repeat mytest_func() within 2 second
+ float rate = benchmark_test_rate(mytest_func, 2);
+ // Display result, sample 'Encode and decode PASS. (703 times/sec.)'
+ benchmark_mgs_rate("Encode and decode", rate);
+
+ */
+
+#define dap_pass_msg_benchmark(testname, benchmark_text) \
+    printf("\t%s%s PASS. %s%s\n", TEXT_COLOR_GRN, testname, benchmark_text, TEXT_COLOR_RESET); \
+    fflush(stdout); \
+
+/**
+ * Display time in the format 'x.xx sec.' or 'xx msec.'
+ */
+void benchmark_mgs_time(const char *test_name, int dt)
+{
+    char buf[120];
+    if(abs(dt) >= 1000) {
+        snprintf(buf, 120, "(%.3lf sec.)", dt * 1. / 1000);
+    }
+    else {
+
+        snprintf(buf, 120, "(%d msec.)", dt);
+    }
+    dap_pass_msg_benchmark(test_name, buf);
+}
+
+/**
+ * Display rate in the format 'xx times/sec.'
+ */
+void benchmark_mgs_rate(const char *test_name, float rate)
+{
+    char buf[120];
+    if(rate > 100) {
+        snprintf(buf, 120, "(%.0lf times/sec.)", rate);
+    }
+    else if(rate > 10) {
+        snprintf(buf, 120, "%.1lf times/sec.", rate);
+    }
+    else {
+        snprintf(buf, 120, "%.2lf times/sec.", rate);
+    }
+    dap_pass_msg_benchmark(test_name, buf);
+}
+
+/**
+ * @return current time in milliseconds
+ */
+int get_cur_time_msec(void)
+{
+    struct timespec time;
+    clock_gettime(CLOCK_MONOTONIC, &time);
+    int msec = time.tv_sec * 1000 + (time.tv_nsec + 500000) / 1000000;
+    return msec;
+}
+
+/**
+ * Calculate the runtime of a function that repeat several times
+ * @func_name function for repeats
+ * @repeat how many times repeats
+ * @return time in milliseconds
+ */
+int benchmark_test_time(void (*func_name)(void), int repeat)
+{
+    int t1 = get_cur_time_msec();
+    for(int i = 0; i < repeat; i++)
+        func_name();
+    int t2 = get_cur_time_msec();
+    return t2 - t1;
+}
+
+/**
+ * Calculate the rate of a function that repeat at a minimum specified number of seconds
+ * @func_name function for repeats
+ * @repeat how many times repeats
+ * @return function rate, i.e. count per second
+ */
+float benchmark_test_rate(void (*func_name)(void), float sec)
+{
+    if(sec < 0.1f) {
+        dap_test_msg("undefined times/sec.");
+        return 0;
+    }
+    int t1 = get_cur_time_msec();
+    int repeat = 0, dt;
+    do {
+        func_name();
+        dt = (get_cur_time_msec() - t1);
+        repeat++;
+    }
+    while(dt < sec * 1000);
+    float rate = repeat * 1000.f / dt;
+    return rate;
+}
+

test-framework/dap_test.h

+#pragma once
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#define TEXT_COLOR_RED   "\x1B[31m"
+#define TEXT_COLOR_GRN   "\x1B[32m"
+#define TEXT_COLOR_YEL   "\x1B[33m"
+#define TEXT_COLOR_BLU   "\x1B[34m"
+#define TEXT_COLOR_MAG   "\x1B[35m"
+#define TEXT_COLOR_CYN   "\x1B[36m"
+#define TEXT_COLOR_WHT   "\x1B[37m"
+#define TEXT_COLOR_RESET "\x1B[0m"
+
+/* Can be used like debug info during write test*/
+/**
+ * @brief Can be used like debug info during write test
+ */
+#define dap_test_msg(...) { \
+    printf("\t%s", TEXT_COLOR_WHT); \
+    printf(__VA_ARGS__); \
+    printf("%s\n", TEXT_COLOR_RESET); \
+    fflush(stdout); }
+
+#define dap_fail(msg) {\
+    printf("\t%s%s!%s\n", TEXT_COLOR_RED, msg, TEXT_COLOR_RESET); \
+    abort();}
+
+/* PIF - print if failed. For checking value in loop, for don't repeat output */
+/**
+ * @brief PIF - print if failed. For checking value in loop, for don't repeat output
+ */
+#define dap_assert_PIF(expr, msg) { \
+    if(expr) {} \
+    else { \
+    printf("\t%s%s FAILED!%s\n", TEXT_COLOR_RED, msg, TEXT_COLOR_RESET); \
+    abort(); } }
+
+/**
+ * @brief
+*/
+#define dap_assert(expr, testname) { \
+    if(expr) { \
+        printf("\t%s%s PASS.%s\n", TEXT_COLOR_GRN, testname, TEXT_COLOR_RESET); \
+        fflush(stdout); \
+    } else { \
+    printf("\t%s%s FAILED!%s\n", TEXT_COLOR_RED, testname, TEXT_COLOR_RESET); \
+    abort(); } } \
+
+/**
+ * @brief Display the name test
+*/
+#define dap_pass_msg(testname) { \
+    printf("\t%s%s PASS.%s\n", TEXT_COLOR_GRN, testname, TEXT_COLOR_RESET); \
+    fflush(stdout); } \
+
+/**
+ * @brief Display the name of the test module
+*/
+#define dap_print_module_name(module_name) { \
+    printf("%s%s passing the tests... %s\n", TEXT_COLOR_CYN, module_name, TEXT_COLOR_RESET); \
+    fflush(stdout); }
+
+#define dap_str_equals(str1, str2) strcmp(str1, str2) == 0
+#define dap_strn_equals(str1, str2, count) strncmp(str1, str2, count) == 0
+int get_cur_time_msec(void);
+
+/*
+ How to use benchmark_xxx() functions:
+
+ void mytest_func()
+ {
+ // doing something ...
+ }
+
+ // Repeat mytest_func() 5 time
+ int dt = benchmark_test_time(mytest_func, 5);
+ // Display result, sample 'Encode and decode PASS. (4 msec.)'
+ benchmark_mgs_time("Encode and decode", dt);
+
+ // Repeat mytest_func() within 2 second
+ float rate = benchmark_test_rate(mytest_func, 2);
+ // Display result, sample 'Encode and decode PASS. (703 times/sec.)'
+ benchmark_mgs_rate("Encode and decode", rate);
+
+ */
+
+/**
+ * Display time in the format 'x.xx sec.' or 'xx msec.'
+ */
+void benchmark_mgs_time(const char *text, int dt);
+
+/**
+ * Display rate in the format 'xx times/sec.'
+ */
+void benchmark_mgs_rate(const char *test_name, float rate);
+/**
+ * Calculate the runtime of a function that repeat several times
+ * @func_name function for repeats
+ * @repeat how many times repeats
+ * @return time in milliseconds
+ */
+int benchmark_test_time(void (*func_name)(void), int repeat);
+/**
+ * Calculate the rate of a function that repeat at a minimum specified number of seconds
+ * @func_name function for repeats
+ * @repeat how many times repeats
+ * @return function rate, i.e. count per second
+ */
+float benchmark_test_rate(void (*func_name)(void), float sec);

test-framework/dap_test_generator.c

+#include "dap_test_generator.h"
+
+#define BYTE_SIZE 255
+
+/**
+ * @brief The function fills an array with random numbers
+ * @param[out] array Takes a pointer to an array
+ * @param[in] size Size of the array passed in the array parameter
+ *
+ * The function fills an array with random integer non-negative values
+*/
+void generate_random_byte_array(uint8_t* array, const size_t size) {
+    srand((uint32_t)time(NULL));
+    for(size_t i = 0; i < size; i++) {
+        array[i] = (uint8_t)rand() % BYTE_SIZE;
+    }
+
+    // Last byte not should be 0
+    if (array[size - 1] == 0)
+        array[size - 1] = 1;
+}

test-framework/dap_test_generator.h

+#pragma once
+#include <stdint.h>
+#include <stdlib.h>
+#include <time.h>
+
+void generate_random_byte_array(uint8_t* array, const size_t size);
+

test-framework/docs/CMakeLists_8txt.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<title>LibDap-test: /home/blus/DemLabs/libdap/MVL/libdap-test/CMakeLists.txt File Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">LibDap-test
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+</div><!-- top -->
+<div class="header">
+  <div class="summary">
+<a href="#func-members">Functions</a>  </div>
+  <div class="headertitle">
+<div class="title">/home/blus/DemLabs/libdap/MVL/libdap-test/CMakeLists.txt File Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
+Functions</h2></td></tr>
+<tr class="memitem:a2ed873368192cb7cc113ab2093062d06"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="CMakeLists_8txt.html#a2ed873368192cb7cc113ab2093062d06">cmake_minimum_required</a> (VERSION 3.0) if(TARGET dap_test) return() endif() project(dap_test) add_library($</td></tr>
+<tr class="separator:a2ed873368192cb7cc113ab2093062d06"><td class="memSeparator" colspan="2">&#160;</td></tr>
+</table>
+<h2 class="groupheader">Function Documentation</h2>
+<a class="anchor" id="a2ed873368192cb7cc113ab2093062d06"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">cmake_minimum_required </td>
+          <td>(</td>
+          <td class="paramtype">VERSION 3.&#160;</td>
+          <td class="paramname"><em>0</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.11
+</small></address>
+</body>
+</html>

test-framework/docs/README_8md.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<title>LibDap-test: /home/blus/DemLabs/libdap/MVL/libdap-test/README.md File Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+  $(document).ready(function() { init_search(); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">LibDap-test
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.11 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+      <li>
+        <div id="MSearchBox" class="MSearchBoxInactive">
+        <span class="left">
+          <img id="MSearchSelect" src="search/mag_sel.png"
+               onmouseover="return searchBox.OnSearchSelectShow()"
+               onmouseout="return searchBox.OnSearchSelectHide()"
+               alt=""/>
+          <input type="text" id="MSearchField" value="Search" accesskey="S"
+               onfocus="searchBox.OnSearchFieldFocus(true)" 
+               onblur="searchBox.OnSearchFieldFocus(false)" 
+               onkeyup="searchBox.OnSearchFieldChange(event)"/>
+          </span><span class="right">
+            <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+          </span>
+        </div>
+      </li>
+    </ul>
+  </div>
+  <div id="navrow2" class="tabs2">
+    <ul class="tablist">
+      <li><a href="files.html"><span>File&#160;List</span></a></li>
+      <li><a href="globals.html"><span>File&#160;Members</span></a></li>
+    </ul>
+  </div>
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+</div><!-- top -->
+<div class="header">
+  <div class="headertitle">
+<div class="title">/home/blus/DemLabs/libdap/MVL/libdap-test/README.md File Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.11
+</small></address>
+</body>
+</html>